[tryton-debian-vcs] tryton-modules-analytic-invoice branch upstream created. f3132c0868b2e01f45b73f12f901d439726d4a91
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 16:58:18 UTC 2013
The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-analytic-invoice.git;a=commitdiff;h=f3132c0868b2e01f45b73f12f901d439726d4a91
commit f3132c0868b2e01f45b73f12f901d439726d4a91
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 17:26:30 2013 +0100
Adding upstream version 3.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 034335d..09d92d7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.0 - 2013-10-21
+* Bug fixes (see mercurial logs for details)
+
Version 2.8.0 - 2013-04-22
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 4e6697b..ab4271e 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_analytic_invoice
-Version: 2.8.0
+Version: 3.0.0
Summary: Tryton module to add analytic accounting on invoice
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
Description: trytond_analytic_invoice
========================
@@ -58,6 +58,7 @@ Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.6
diff --git a/invoice.py b/invoice.py
index 5beaa8f..4ce6714 100644
--- a/invoice.py
+++ b/invoice.py
@@ -35,7 +35,9 @@ class InvoiceLine:
['analytic_accounts'])['analytic_accounts']
fields.update(AnalyticAccount.analytic_accounts_fields_get(
- analytic_accounts_field, fields_names))
+ analytic_accounts_field, fields_names,
+ states=cls.analytic_accounts.states,
+ required_states=Eval('type') == 'line'))
return fields
@classmethod
@@ -193,7 +195,7 @@ class InvoiceLine:
vals['credit'] = value['credit']
vals['account'] = account.id
vals['journal'] = self.invoice.journal.id
- vals['date'] = (self.invoice.accounting_date
+ vals['date'] = (self.invoice.accounting_date
or self.invoice.invoice_date)
vals['reference'] = self.invoice.reference
vals['party'] = self.invoice.party.id
diff --git a/locale/sl_SI.po b/locale/sl_SI.po
new file mode 100644
index 0000000..e17f67e
--- /dev/null
+++ b/locale/sl_SI.po
@@ -0,0 +1,7 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:account.invoice.line,analytic_accounts:"
+msgid "Analytic Accounts"
+msgstr "Analitični konti"
diff --git a/setup.py b/setup.py
index a888e75..f4323c7 100644
--- a/setup.py
+++ b/setup.py
@@ -62,6 +62,7 @@ setup(name='trytond_analytic_invoice',
'Natural Language :: French',
'Natural Language :: German',
'Natural Language :: Russian',
+ 'Natural Language :: Slovenian',
'Natural Language :: Spanish',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2.6',
diff --git a/tests/__init__.py b/tests/__init__.py
index caca5e3..52b39ea 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -2,3 +2,5 @@
#this repository contains the full copyright notices and license terms.
from .test_analytic_invoice import suite
+
+__all__ = ['suite']
diff --git a/tryton.cfg b/tryton.cfg
index 5776759..fe818bf 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.8.0
+version=3.0.0
depends:
account_invoice
analytic_account
diff --git a/trytond_analytic_invoice.egg-info/PKG-INFO b/trytond_analytic_invoice.egg-info/PKG-INFO
index abda859..c838dfd 100644
--- a/trytond_analytic_invoice.egg-info/PKG-INFO
+++ b/trytond_analytic_invoice.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-analytic-invoice
-Version: 2.8.0
+Version: 3.0.0
Summary: Tryton module to add analytic accounting on invoice
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
Description: trytond_analytic_invoice
========================
@@ -58,6 +58,7 @@ Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.6
diff --git a/trytond_analytic_invoice.egg-info/SOURCES.txt b/trytond_analytic_invoice.egg-info/SOURCES.txt
index 0dd8031..300cc7f 100644
--- a/trytond_analytic_invoice.egg-info/SOURCES.txt
+++ b/trytond_analytic_invoice.egg-info/SOURCES.txt
@@ -21,6 +21,7 @@ locale/es_ES.po
locale/fr_FR.po
locale/nl_NL.po
locale/ru_RU.po
+locale/sl_SI.po
trytond_analytic_invoice.egg-info/PKG-INFO
trytond_analytic_invoice.egg-info/SOURCES.txt
trytond_analytic_invoice.egg-info/dependency_links.txt
diff --git a/trytond_analytic_invoice.egg-info/requires.txt b/trytond_analytic_invoice.egg-info/requires.txt
index 300d62e..901d602 100644
--- a/trytond_analytic_invoice.egg-info/requires.txt
+++ b/trytond_analytic_invoice.egg-info/requires.txt
@@ -1,3 +1,3 @@
-trytond_account_invoice >= 2.8, < 2.9
-trytond_analytic_account >= 2.8, < 2.9
-trytond >= 2.8, < 2.9
\ No newline at end of file
+trytond_account_invoice >= 3.0, < 3.1
+trytond_analytic_account >= 3.0, < 3.1
+trytond >= 3.0, < 3.1
\ No newline at end of file
commit a21d76c2f0455f9cf5d396ae2acbd2ae899779bc
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu May 2 00:35:16 2013 +0200
Adding upstream version 2.8.0.
diff --git a/CHANGELOG b/CHANGELOG
index 39c1db7..034335d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Version 2.6.1 - 2012-12-23
+Version 2.8.0 - 2013-04-22
* Bug fixes (see mercurial logs for details)
Version 2.6.0 - 2012-10-22
diff --git a/COPYRIGHT b/COPYRIGHT
index 2057c72..d7165c7 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2012 Cédric Krier.
+Copyright (C) 2008-2013 Cédric Krier.
Copyright (C) 2008-2012 Bertrand Chenal.
-Copyright (C) 2008-2012 B2CK SPRL.
+Copyright (C) 2008-2013 B2CK SPRL.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/MANIFEST.in b/MANIFEST.in
index 44969c7..18ce53c 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,5 +6,6 @@ include CHANGELOG
include LICENSE
include tryton.cfg
include *.xml
+include view/*.xml
include *.odt
include locale/*.po
diff --git a/PKG-INFO b/PKG-INFO
index 34f802f..4e6697b 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_analytic_invoice
-Version: 2.6.1
+Version: 2.8.0
Summary: Tryton module to add analytic accounting on invoice
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.6/
+Download-URL: http://downloads.tryton.org/2.8/
Description: trytond_analytic_invoice
========================
diff --git a/invoice.py b/invoice.py
index ff38301..5beaa8f 100644
--- a/invoice.py
+++ b/invoice.py
@@ -55,8 +55,7 @@ class InvoiceLine:
res = super(InvoiceLine, cls).read(ids, fields_names=fields_names2)
if not fields_names:
- fields_names = list(set(cls._fields.keys() \
- + cls._inherit_fields.keys()))
+ fields_names = cls._fields.keys()
root_ids = []
for field in fields_names:
@@ -69,41 +68,43 @@ class InvoiceLine:
lines = cls.browse(ids)
for line in lines:
for root_id in root_ids:
- id2record[line.id]['analytic_account_' \
- + str(root_id)] = None
+ id2record[line.id]['analytic_account_'
+ + str(root_id)] = None
if line.type != 'line':
continue
if not line.analytic_accounts:
continue
for account in line.analytic_accounts.accounts:
if account.root.id in root_ids:
- id2record[line.id]['analytic_account_' \
- + str(account.root.id)] = account.id
+ id2record[line.id]['analytic_account_'
+ + str(account.root.id)] = account.id
for field in fields_names:
- if field.startswith('analytic_account_' + \
- str(account.root.id) + '.'):
+ if field.startswith('analytic_account_'
+ + str(account.root.id) + '.'):
ham, field2 = field.split('.', 1)
id2record[line.id][field] = account[field2]
return res
@classmethod
- def create(cls, vals):
+ def create(cls, vlist):
Selection = Pool().get('analytic_account.account.selection')
- vals = vals.copy()
- selection_vals = {}
- for field in vals.keys():
- if field.startswith('analytic_account_'):
- if vals[field]:
- selection_vals.setdefault('accounts', [])
- selection_vals['accounts'].append(('add', [vals[field]]))
- del vals[field]
- if vals.get('analytic_accounts'):
- Selection.write([Selection(vals['analytic_accounts'])],
- selection_vals)
- elif vals.get('type', 'line') == 'line':
- selection = Selection.create(selection_vals)
- vals['analytic_accounts'] = selection.id
- return super(InvoiceLine, cls).create(vals)
+ vlist = [x.copy() for x in vlist]
+ for vals in vlist:
+ selection_vals = {}
+ for field in vals.keys():
+ if field.startswith('analytic_account_'):
+ if vals[field]:
+ selection_vals.setdefault('accounts', [])
+ selection_vals['accounts'].append(('add',
+ [vals[field]]))
+ del vals[field]
+ if vals.get('analytic_accounts'):
+ Selection.write([Selection(vals['analytic_accounts'])],
+ selection_vals)
+ elif vals.get('type', 'line') == 'line':
+ selection, = Selection.create([selection_vals])
+ vals['analytic_accounts'] = selection.id
+ return super(InvoiceLine, cls).create(vlist)
@classmethod
def write(cls, lines, vals):
@@ -123,7 +124,7 @@ class InvoiceLine:
if not line.analytic_accounts:
# Create missing selection
with Transaction().set_user(0):
- selection = Selection.create({})
+ selection, = Selection.create([{}])
cls.write([line], {
'analytic_accounts': selection.id,
})
@@ -184,6 +185,7 @@ class InvoiceLine:
if self.analytic_accounts and self.analytic_accounts.accounts:
for value in values:
value['analytic_lines'] = []
+ to_create = []
for account in self.analytic_accounts.accounts:
vals = {}
vals['name'] = self.description
@@ -191,10 +193,13 @@ class InvoiceLine:
vals['credit'] = value['credit']
vals['account'] = account.id
vals['journal'] = self.invoice.journal.id
- vals['date'] = self.invoice.invoice_date
+ vals['date'] = (self.invoice.accounting_date
+ or self.invoice.invoice_date)
vals['reference'] = self.invoice.reference
vals['party'] = self.invoice.party.id
- value['analytic_lines'].append(('create', vals))
+ to_create.append(vals)
+ if to_create:
+ value['analytic_lines'] = [('create', to_create)]
return values
@@ -210,13 +215,13 @@ class Account(ModelSQL, ModelView):
InvoiceLine._fields_view_get_cache.clear()
@classmethod
- def create(cls, vals):
+ def create(cls, vlist):
InvoiceLine = Pool().get('account.invoice.line')
- account = super(Account, cls).create(vals)
+ accounts = super(Account, cls).create(vlist)
# Restart the cache on the fields_view_get method of
# account.invoice.line
InvoiceLine._fields_view_get_cache.clear()
- return account
+ return accounts
@classmethod
def write(cls, accounts, vals):
diff --git a/invoice.xml b/invoice.xml
index 7509e7f..0fff583 100644
--- a/invoice.xml
+++ b/invoice.xml
@@ -6,19 +6,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.ui.view" id="invoice_line_view_form">
<field name="model">account.invoice.line</field>
<field name="inherit" ref="account_invoice.invoice_line_view_form"/>
- <field name="arch" type="xml">
- <![CDATA[
- <data>
- <xpath
- expr="/form/notebook/page/field[@name="taxes"]"
- position="before">
- <group col="4" colspan="4" name="analytic_accounts">
- <field name="analytic_accounts"/>
- </group>
- </xpath>
- </data>
- ]]>
- </field>
+ <field name="name">invoice_line_form</field>
</record>
</data>
</tryton>
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 1d3bd89..054e2aa 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -4,4 +4,4 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:account.invoice.line,analytic_accounts:"
msgid "Analytic Accounts"
-msgstr ""
+msgstr "Счета аналитики"
diff --git a/setup.py b/setup.py
index 49dc191..a888e75 100644
--- a/setup.py
+++ b/setup.py
@@ -25,10 +25,10 @@ requires = []
for dep in info.get('depends', []):
if not re.match(r'(ir|res|webdav)(\W|$)', dep):
requires.append('trytond_%s >= %s.%s, < %s.%s' %
- (dep, major_version, minor_version, major_version,
- minor_version + 1))
+ (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))
+ (major_version, minor_version, major_version, minor_version + 1))
setup(name='trytond_analytic_invoice',
version=info.get('version', '0.0.1'),
@@ -36,16 +36,16 @@ setup(name='trytond_analytic_invoice',
long_description=read('README'),
author='Tryton',
url='http://www.tryton.org/',
- download_url="http://downloads.tryton.org/" + \
- info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
+ download_url=("http://downloads.tryton.org/" +
+ info.get('version', '0.0.1').rsplit('.', 1)[0] + '/'),
package_dir={'trytond.modules.analytic_invoice': '.'},
packages=[
'trytond.modules.analytic_invoice',
'trytond.modules.analytic_invoice.tests',
],
package_data={
- 'trytond.modules.analytic_invoice': info.get('xml', []) \
- + ['tryton.cfg', 'locale/*.po'],
+ 'trytond.modules.analytic_invoice': (info.get('xml', [])
+ + ['tryton.cfg', 'view/*.xml', 'locale/*.po']),
},
classifiers=[
'Development Status :: 5 - Production/Stable',
diff --git a/tryton.cfg b/tryton.cfg
index b14d8fc..5776759 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.6.1
+version=2.8.0
depends:
account_invoice
analytic_account
diff --git a/trytond_analytic_invoice.egg-info/PKG-INFO b/trytond_analytic_invoice.egg-info/PKG-INFO
index bd291ea..abda859 100644
--- a/trytond_analytic_invoice.egg-info/PKG-INFO
+++ b/trytond_analytic_invoice.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-analytic-invoice
-Version: 2.6.1
+Version: 2.8.0
Summary: Tryton module to add analytic accounting on invoice
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.6/
+Download-URL: http://downloads.tryton.org/2.8/
Description: trytond_analytic_invoice
========================
diff --git a/trytond_analytic_invoice.egg-info/SOURCES.txt b/trytond_analytic_invoice.egg-info/SOURCES.txt
index a534036..0dd8031 100644
--- a/trytond_analytic_invoice.egg-info/SOURCES.txt
+++ b/trytond_analytic_invoice.egg-info/SOURCES.txt
@@ -27,4 +27,5 @@ trytond_analytic_invoice.egg-info/dependency_links.txt
trytond_analytic_invoice.egg-info/entry_points.txt
trytond_analytic_invoice.egg-info/not-zip-safe
trytond_analytic_invoice.egg-info/requires.txt
-trytond_analytic_invoice.egg-info/top_level.txt
\ No newline at end of file
+trytond_analytic_invoice.egg-info/top_level.txt
+view/invoice_line_form.xml
\ No newline at end of file
diff --git a/trytond_analytic_invoice.egg-info/requires.txt b/trytond_analytic_invoice.egg-info/requires.txt
index 287b990..300d62e 100644
--- a/trytond_analytic_invoice.egg-info/requires.txt
+++ b/trytond_analytic_invoice.egg-info/requires.txt
@@ -1,3 +1,3 @@
-trytond_account_invoice >= 2.6, < 2.7
-trytond_analytic_account >= 2.6, < 2.7
-trytond >= 2.6, < 2.7
\ No newline at end of file
+trytond_account_invoice >= 2.8, < 2.9
+trytond_analytic_account >= 2.8, < 2.9
+trytond >= 2.8, < 2.9
\ No newline at end of file
diff --git a/view/invoice_line_form.xml b/view/invoice_line_form.xml
new file mode 100644
index 0000000..b0fa414
--- /dev/null
+++ b/view/invoice_line_form.xml
@@ -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. -->
+<data>
+ <xpath
+ expr="/form/notebook/page/field[@name='taxes']"
+ position="before">
+ <group col="4" colspan="4" name="analytic_accounts">
+ <field name="analytic_accounts"/>
+ </group>
+ </xpath>
+</data>
commit 78ebdc6baf3362238b6f37bc690ac07d3b2c1d2f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri Feb 15 20:50:33 2013 +0100
Adding upstream version 2.6.1.
diff --git a/CHANGELOG b/CHANGELOG
index e70af61..39c1db7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.1 - 2012-12-23
+* Bug fixes (see mercurial logs for details)
+
Version 2.6.0 - 2012-10-22
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index a96550f..34f802f 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond_analytic_invoice
-Version: 2.6.0
+Version: 2.6.1
Summary: Tryton module to add analytic accounting on invoice
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/invoice.py b/invoice.py
index 8a631fe..ff38301 100644
--- a/invoice.py
+++ b/invoice.py
@@ -95,7 +95,7 @@ class InvoiceLine:
if field.startswith('analytic_account_'):
if vals[field]:
selection_vals.setdefault('accounts', [])
- selection_vals['accounts'].append(('add', vals[field]))
+ selection_vals['accounts'].append(('add', [vals[field]]))
del vals[field]
if vals.get('analytic_accounts'):
Selection.write([Selection(vals['analytic_accounts'])],
diff --git a/tryton.cfg b/tryton.cfg
index db9947d..b14d8fc 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.6.0
+version=2.6.1
depends:
account_invoice
analytic_account
diff --git a/trytond_analytic_invoice.egg-info/PKG-INFO b/trytond_analytic_invoice.egg-info/PKG-INFO
index db0bf80..bd291ea 100644
--- a/trytond_analytic_invoice.egg-info/PKG-INFO
+++ b/trytond_analytic_invoice.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond-analytic-invoice
-Version: 2.6.0
+Version: 2.6.1
Summary: Tryton module to add analytic accounting on invoice
Home-page: http://www.tryton.org/
Author: Tryton
commit 5e828c1d51909c9a7144b2f38d45bf38548d4eec
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Oct 23 19:53:27 2012 +0200
Adding upstream version 2.6.0.
diff --git a/CHANGELOG b/CHANGELOG
index dc330ba..e70af61 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,5 @@
-Version 2.4.1 - 2012-04-24
-* Restore es_AR translation
+Version 2.6.0 - 2012-10-22
+* Bug fixes (see mercurial logs for details)
Version 2.4.0 - 2012-04-23
* Bug fixes (see mercurial logs for details)
diff --git a/MANIFEST.in b/MANIFEST.in
index 7f5d5fd..44969c7 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -4,6 +4,7 @@ include TODO
include COPYRIGHT
include CHANGELOG
include LICENSE
+include tryton.cfg
include *.xml
include *.odt
include locale/*.po
diff --git a/PKG-INFO b/PKG-INFO
index 070a6cb..a96550f 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,14 +1,48 @@
Metadata-Version: 1.0
Name: trytond_analytic_invoice
-Version: 2.4.1
-Summary: Add analytic account on invoice lines and generate analytic lines on the moves of invoice.
-
+Version: 2.6.0
+Summary: Tryton module to add analytic accounting on invoice
Home-page: http://www.tryton.org/
-Author: B2CK
-Author-email: info at b2ck.com
+Author: Tryton
+Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.4/
-Description: UNKNOWN
+Download-URL: http://downloads.tryton.org/2.6/
+Description: trytond_analytic_invoice
+ ========================
+
+ The analytic_invoice module of the Tryton application platform.
+
+ Installing
+ ----------
+
+ See INSTALL
+
+ Support
+ -------
+
+ If you encounter any problems with Tryton, please don't hesitate to ask
+ questions on the Tryton bug tracker, mailing list, wiki or IRC channel:
+
+ http://bugs.tryton.org/
+ http://groups.tryton.org/
+ http://wiki.tryton.org/
+ irc://irc.freenode.net/tryton
+
+ License
+ -------
+
+ See LICENSE
+
+ Copyright
+ ---------
+
+ See COPYRIGHT
+
+
+ For more information please visit the Tryton web site:
+
+ http://www.tryton.org/
+
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
diff --git a/README b/README
index 27ef5eb..ffafa6b 100644
--- a/README
+++ b/README
@@ -2,7 +2,6 @@ trytond_analytic_invoice
========================
The analytic_invoice module of the Tryton application platform.
-See __tryton__.py
Installing
----------
diff --git a/__init__.py b/__init__.py
index ef5b670..f71cffd 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,4 +1,12 @@
#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 trytond.pool import Pool
from .invoice import *
+
+
+def register():
+ Pool.register(
+ InvoiceLine,
+ Account,
+ module='analytic_invoice', type_='model')
diff --git a/__tryton__.py b/__tryton__.py
deleted file mode 100644
index 14f71ae..0000000
--- a/__tryton__.py
+++ /dev/null
@@ -1,57 +0,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.
-{
- 'name': 'Analytic Invoice',
- 'name_bg_BG': 'Аналитична фактура',
- 'name_ca_ES': 'Facturació analítica',
- 'name_de_DE': 'Kostenstellen Rechnungsstellung',
- 'name_es_AR': 'Facturación Analítica',
- 'name_es_CO': 'Facturación Analítica',
- 'name_es_ES': 'Facturación analítica',
- 'name_fr_FR': 'Facturation analytique',
- 'version': '2.4.1',
- 'author': 'B2CK',
- 'email': 'info at b2ck.com',
- 'website': 'http://www.tryton.org/',
- 'description': '''Add analytic account on invoice lines and generate analytic lines on the moves of invoice.
-''',
- 'description_bg_BG': ''' - Добавя аналитична сметна за редове на фактури и генерира аналитични редове за движения от фактура
-''',
- 'description_ca_ES': '''Afegeix un compte analític a les línies de factura
-i genera línies analítiques pels assentaments de la factura.
-''',
- 'description_de_DE': ''' - Fügt Kostenstellen zu Rechnungszeilen hinzu
- - Erstellt Positionen für Kostenstellen bei Buchung von Rechnungen
-''',
- 'description_es_AR': '''Añade contabilidad analítica en las líneas de
-factura y genera líneas analíticas en los asientos de la factura.''',
- 'description_es_CO': ''' - Adición de contabilidad analítica a las líneas de facturación
- - Generación de líneas analíticas en la factura.
-''',
- 'description_es_ES': '''Añade una cuenta analítica en las líneas de
-factura y genera líneas analíticas por los asientos de la factura.
-''',
- 'description_fr_FR': '''Ajoute la comptabilité analytique sur les lignes '''
- '''de facture et génère les lignes analytiques sur les mouvements de la '''
- '''facture.''',
-
- 'depends': [
- 'account_invoice',
- 'analytic_account',
- ],
- 'xml': [
- 'invoice.xml',
- ],
- 'translation': [
- 'locale/bg_BG.po',
- 'locale/ca_ES.po',
- 'locale/cs_CZ.po',
- 'locale/de_DE.po',
- 'locale/es_AR.po',
- 'locale/es_CO.po',
- 'locale/es_ES.po',
- 'locale/fr_FR.po',
- 'locale/nl_NL.po',
- 'locale/ru_RU.po',
- ],
-}
diff --git a/invoice.py b/invoice.py
index dba287c..8a631fe 100644
--- a/invoice.py
+++ b/invoice.py
@@ -3,12 +3,14 @@
from trytond.model import ModelView, ModelSQL, fields
from trytond.pyson import Eval
from trytond.transaction import Transaction
-from trytond.pool import Pool
+from trytond.pool import Pool, PoolMeta
+__all__ = ['InvoiceLine', 'Account']
+__metaclass__ = PoolMeta
-class InvoiceLine(ModelSQL, ModelView):
- _name = 'account.invoice.line'
+class InvoiceLine:
+ __name__ = 'account.invoice.line'
analytic_accounts = fields.Many2One('analytic_account.account.selection',
'Analytic Accounts',
states={
@@ -16,47 +18,45 @@ class InvoiceLine(ModelSQL, ModelView):
},
depends=['type'])
- def _view_look_dom_arch(self, tree, type, field_children=None):
- analytic_account_obj = Pool().get('analytic_account.account')
- analytic_account_obj.convert_view(tree)
- arch, fields = super(InvoiceLine, self)._view_look_dom_arch(tree, type,
+ @classmethod
+ def _view_look_dom_arch(cls, tree, type, field_children=None):
+ AnalyticAccount = Pool().get('analytic_account.account')
+ AnalyticAccount.convert_view(tree)
+ return super(InvoiceLine, cls)._view_look_dom_arch(tree, type,
field_children=field_children)
- return arch, fields
- def fields_get(self, fields_names=None):
- analytic_account_obj = Pool().get('analytic_account.account')
+ @classmethod
+ def fields_get(cls, fields_names=None):
+ AnalyticAccount = Pool().get('analytic_account.account')
- res = super(InvoiceLine, self).fields_get(fields_names)
+ fields = super(InvoiceLine, cls).fields_get(fields_names)
- analytic_accounts_field = super(InvoiceLine, self).fields_get(
+ analytic_accounts_field = super(InvoiceLine, cls).fields_get(
['analytic_accounts'])['analytic_accounts']
- res.update(analytic_account_obj.analytic_accounts_fields_get(
- analytic_accounts_field, fields_names))
- return res
+ fields.update(AnalyticAccount.analytic_accounts_fields_get(
+ analytic_accounts_field, fields_names))
+ return fields
- def default_get(self, fields, with_rec_name=True):
+ @classmethod
+ def default_get(cls, fields, with_rec_name=True):
fields = [x for x in fields if not x.startswith('analytic_account_')]
- return super(InvoiceLine, self).default_get(fields,
+ return super(InvoiceLine, cls).default_get(fields,
with_rec_name=with_rec_name)
- def read(self, ids, fields_names=None):
- int_id = False
- if isinstance(ids, (int, long)):
- int_id = True
- ids = [ids]
-
+ @classmethod
+ def read(cls, ids, fields_names=None):
if fields_names:
fields_names2 = [x for x in fields_names
if not x.startswith('analytic_account_')]
else:
fields_names2 = fields_names
- res = super(InvoiceLine, self).read(ids, fields_names=fields_names2)
+ res = super(InvoiceLine, cls).read(ids, fields_names=fields_names2)
if not fields_names:
- fields_names = list(set(self._columns.keys() \
- + self._inherit_fields.keys()))
+ fields_names = list(set(cls._fields.keys() \
+ + cls._inherit_fields.keys()))
root_ids = []
for field in fields_names:
@@ -66,7 +66,7 @@ class InvoiceLine(ModelSQL, ModelView):
id2record = {}
for record in res:
id2record[record['id']] = record
- lines = self.browse(ids)
+ lines = cls.browse(ids)
for line in lines:
for root_id in root_ids:
id2record[line.id]['analytic_account_' \
@@ -84,12 +84,11 @@ class InvoiceLine(ModelSQL, ModelView):
str(account.root.id) + '.'):
ham, field2 = field.split('.', 1)
id2record[line.id][field] = account[field2]
- if int_id:
- return res[0]
return res
- def create(self, vals):
- selection_obj = Pool().get('analytic_account.account.selection')
+ @classmethod
+ def create(cls, vals):
+ Selection = Pool().get('analytic_account.account.selection')
vals = vals.copy()
selection_vals = {}
for field in vals.keys():
@@ -99,17 +98,17 @@ class InvoiceLine(ModelSQL, ModelView):
selection_vals['accounts'].append(('add', vals[field]))
del vals[field]
if vals.get('analytic_accounts'):
- selection_obj.write(vals['analytic_accounts'], selection_vals)
+ Selection.write([Selection(vals['analytic_accounts'])],
+ selection_vals)
elif vals.get('type', 'line') == 'line':
- selection_id = selection_obj.create(selection_vals)
- vals['analytic_accounts'] = selection_id
- return super(InvoiceLine, self).create(vals)
+ selection = Selection.create(selection_vals)
+ vals['analytic_accounts'] = selection.id
+ return super(InvoiceLine, cls).create(vals)
- def write(self, ids, vals):
- selection_obj = Pool().get('analytic_account.account.selection')
+ @classmethod
+ def write(cls, lines, vals):
+ Selection = Pool().get('analytic_account.account.selection')
vals = vals.copy()
- if isinstance(ids, (int, long)):
- ids = [ids]
selection_vals = {}
for field in vals.keys():
if field.startswith('analytic_account_'):
@@ -117,7 +116,6 @@ class InvoiceLine(ModelSQL, ModelView):
selection_vals[root_id] = vals[field]
del vals[field]
if selection_vals:
- lines = self.browse(ids)
for line in lines:
if line.type != 'line':
continue
@@ -125,11 +123,10 @@ class InvoiceLine(ModelSQL, ModelView):
if not line.analytic_accounts:
# Create missing selection
with Transaction().set_user(0):
- selection_id = selection_obj.create({})
- self.write(line.id, {
- 'analytic_accounts': selection_id,
- })
- line = self.browse(line.id)
+ selection = Selection.create({})
+ cls.write([line], {
+ 'analytic_accounts': selection.id,
+ })
for account in line.analytic_accounts.accounts:
if account.root.id in selection_vals:
value = selection_vals[account.root.id]
@@ -141,103 +138,90 @@ class InvoiceLine(ModelSQL, ModelView):
if account_id \
and account_id not in accounts:
accounts.append(account_id)
- selection_obj.write(line.analytic_accounts.id, {
- 'accounts': [('set', accounts)],
- })
- return super(InvoiceLine, self).write(ids, vals)
+ Selection.write([line.analytic_accounts], {
+ 'accounts': [('set', accounts)],
+ })
+ super(InvoiceLine, cls).write(lines, vals)
- def delete(self, ids):
- selection_obj = Pool().get('analytic_account.account.selection')
+ @classmethod
+ def delete(cls, lines):
+ Selection = Pool().get('analytic_account.account.selection')
- if isinstance(ids, (int, long)):
- ids = [ids]
selection_ids = []
- lines = self.browse(ids)
for line in lines:
if line.analytic_accounts:
selection_ids.append(line.analytic_accounts.id)
- res = super(InvoiceLine, self).delete(ids)
- selection_obj.delete(selection_ids)
- return res
-
- def copy(self, ids, default=None):
- selection_obj = Pool().get('analytic_account.account.selection')
+ super(InvoiceLine, cls).delete(lines)
+ Selection.delete(Selection.browse(selection_ids))
- new_ids = super(InvoiceLine, self).copy(ids, default=default)
+ @classmethod
+ def copy(cls, lines, default=None):
+ Selection = Pool().get('analytic_account.account.selection')
- int_id = False
- if isinstance(new_ids, (int, long)):
- int_id = True
- new_ids = [new_ids]
+ new_lines = super(InvoiceLine, cls).copy(lines, default=default)
- for line in self.browse(new_ids):
+ for line in new_lines:
if line.analytic_accounts:
- selection_id = selection_obj.copy(line.analytic_accounts.id)
- self.write(line.id, {
- 'analytic_accounts': selection_id,
- })
-
- if int_id:
- return new_ids[0]
- return new_ids
+ selection, = Selection.copy([line.analytic_accounts])
+ cls.write([line], {
+ 'analytic_accounts': selection.id,
+ })
+ return new_lines
- def _credit(self, line):
- selection_obj = Pool().get('analytic_account.account.selection')
+ def _credit(self):
+ Selection = Pool().get('analytic_account.account.selection')
- result = super(InvoiceLine, self)._credit(line)
+ result = super(InvoiceLine, self)._credit()
- if line.analytic_accounts:
- selection_id = selection_obj.copy(line.analytic_accounts.id)
- result['analytic_accounts'] = selection_id
+ if self.analytic_accounts:
+ selection, = Selection.copy([self.analytic_accounts])
+ result['analytic_accounts'] = selection.id
return result
- def get_move_line(self, line):
- values = super(InvoiceLine, self).get_move_line(line)
- if line.analytic_accounts and line.analytic_accounts.accounts:
+ def get_move_line(self):
+ values = super(InvoiceLine, self).get_move_line()
+ if self.analytic_accounts and self.analytic_accounts.accounts:
for value in values:
value['analytic_lines'] = []
- for account in line.analytic_accounts.accounts:
+ for account in self.analytic_accounts.accounts:
vals = {}
- vals['name'] = line.description
+ vals['name'] = self.description
vals['debit'] = value['debit']
vals['credit'] = value['credit']
vals['account'] = account.id
- vals['journal'] = line.invoice.journal.id
- vals['date'] = line.invoice.invoice_date
- vals['reference'] = line.invoice.reference
- vals['party'] = line.invoice.party.id
+ vals['journal'] = self.invoice.journal.id
+ vals['date'] = self.invoice.invoice_date
+ vals['reference'] = self.invoice.reference
+ vals['party'] = self.invoice.party.id
value['analytic_lines'].append(('create', vals))
return values
-InvoiceLine()
-
class Account(ModelSQL, ModelView):
- _name = 'analytic_account.account'
+ __name__ = 'analytic_account.account'
- def delete(self, ids):
- account_invoice_line_obj = Pool().get('account.invoice.line')
- res = super(Account, self).delete(ids)
+ @classmethod
+ def delete(cls, accounts):
+ InvoiceLine = Pool().get('account.invoice.line')
+ super(Account, cls).delete(accounts)
# Restart the cache on the fields_view_get method of
# account.invoice.line
- account_invoice_line_obj.fields_view_get.reset()
- return res
+ InvoiceLine._fields_view_get_cache.clear()
- def create(self, vals):
- account_invoice_line_obj = Pool().get('account.invoice.line')
- res = super(Account, self).create(vals)
+ @classmethod
+ def create(cls, vals):
+ InvoiceLine = Pool().get('account.invoice.line')
+ account = super(Account, cls).create(vals)
# Restart the cache on the fields_view_get method of
# account.invoice.line
- account_invoice_line_obj.fields_view_get.reset()
- return res
+ InvoiceLine._fields_view_get_cache.clear()
+ return account
- def write(self, ids, vals):
- account_invoice_line_obj = Pool().get('account.invoice.line')
- res = super(Account, self).write(ids, vals)
+ @classmethod
+ def write(cls, accounts, vals):
+ InvoiceLine = Pool().get('account.invoice.line')
+ super(Account, cls).write(accounts, vals)
# Restart the cache on the fields_view_get method of
# account.invoice.line
- account_invoice_line_obj.fields_view_get.reset()
- return res
-
-Account()
+ InvoiceLine._fields_view_get_cache.clear()
diff --git a/setup.py b/setup.py
index 9e77b5d..49dc191 100644
--- a/setup.py
+++ b/setup.py
@@ -4,8 +4,19 @@
from setuptools import setup
import re
+import os
+import ConfigParser
-info = eval(open('__tryton__.py').read())
+
+def read(fname):
+ return open(os.path.join(os.path.dirname(__file__), fname)).read()
+
+config = ConfigParser.ConfigParser()
+config.readfp(open('tryton.cfg'))
+info = dict(config.items('tryton'))
+for key in ('depends', 'extras_depend', 'xml'):
+ if key in info:
+ info[key] = info[key].strip().splitlines()
major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
major_version = int(major_version)
minor_version = int(minor_version)
@@ -21,21 +32,21 @@ requires.append('trytond >= %s.%s, < %s.%s' %
setup(name='trytond_analytic_invoice',
version=info.get('version', '0.0.1'),
- description=info.get('description', ''),
- author=info.get('author', ''),
- author_email=info.get('email', ''),
- url=info.get('website', ''),
+ description='Tryton module to add analytic accounting on invoice',
+ long_description=read('README'),
+ author='Tryton',
+ url='http://www.tryton.org/',
download_url="http://downloads.tryton.org/" + \
- info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
+ info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
package_dir={'trytond.modules.analytic_invoice': '.'},
packages=[
'trytond.modules.analytic_invoice',
'trytond.modules.analytic_invoice.tests',
- ],
+ ],
package_data={
'trytond.modules.analytic_invoice': info.get('xml', []) \
- + info.get('translation', []),
- },
+ + ['tryton.cfg', 'locale/*.po'],
+ },
classifiers=[
'Development Status :: 5 - Production/Stable',
'Environment :: Plugins',
@@ -57,7 +68,7 @@ setup(name='trytond_analytic_invoice',
'Programming Language :: Python :: 2.7',
'Topic :: Office/Business',
'Topic :: Office/Business :: Financial :: Accounting',
- ],
+ ],
license='GPL-3',
install_requires=requires,
zip_safe=False,
@@ -67,4 +78,4 @@ setup(name='trytond_analytic_invoice',
""",
test_suite='tests',
test_loader='trytond.test_loader:Loader',
-)
+ )
diff --git a/tryton.cfg b/tryton.cfg
new file mode 100644
index 0000000..db9947d
--- /dev/null
+++ b/tryton.cfg
@@ -0,0 +1,7 @@
+[tryton]
+version=2.6.0
+depends:
+ account_invoice
+ analytic_account
+xml:
+ invoice.xml
diff --git a/trytond_analytic_invoice.egg-info/PKG-INFO b/trytond_analytic_invoice.egg-info/PKG-INFO
index 0630177..db0bf80 100644
--- a/trytond_analytic_invoice.egg-info/PKG-INFO
+++ b/trytond_analytic_invoice.egg-info/PKG-INFO
@@ -1,14 +1,48 @@
Metadata-Version: 1.0
Name: trytond-analytic-invoice
-Version: 2.4.1
-Summary: Add analytic account on invoice lines and generate analytic lines on the moves of invoice.
-
+Version: 2.6.0
+Summary: Tryton module to add analytic accounting on invoice
Home-page: http://www.tryton.org/
-Author: B2CK
-Author-email: info at b2ck.com
+Author: Tryton
+Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.4/
-Description: UNKNOWN
+Download-URL: http://downloads.tryton.org/2.6/
+Description: trytond_analytic_invoice
+ ========================
+
+ The analytic_invoice module of the Tryton application platform.
+
+ Installing
+ ----------
+
+ See INSTALL
+
+ Support
+ -------
+
+ If you encounter any problems with Tryton, please don't hesitate to ask
+ questions on the Tryton bug tracker, mailing list, wiki or IRC channel:
+
+ http://bugs.tryton.org/
+ http://groups.tryton.org/
+ http://wiki.tryton.org/
+ irc://irc.freenode.net/tryton
+
+ License
+ -------
+
+ See LICENSE
+
+ Copyright
+ ---------
+
+ See COPYRIGHT
+
+
+ For more information please visit the Tryton web site:
+
+ http://www.tryton.org/
+
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
diff --git a/trytond_analytic_invoice.egg-info/SOURCES.txt b/trytond_analytic_invoice.egg-info/SOURCES.txt
index 7f3919e..a534036 100644
--- a/trytond_analytic_invoice.egg-info/SOURCES.txt
+++ b/trytond_analytic_invoice.egg-info/SOURCES.txt
@@ -6,8 +6,8 @@ MANIFEST.in
README
invoice.xml
setup.py
+tryton.cfg
./__init__.py
-./__tryton__.py
./invoice.py
./tests/__init__.py
./tests/test_analytic_invoice.py
diff --git a/trytond_analytic_invoice.egg-info/requires.txt b/trytond_analytic_invoice.egg-info/requires.txt
index cddd009..287b990 100644
--- a/trytond_analytic_invoice.egg-info/requires.txt
+++ b/trytond_analytic_invoice.egg-info/requires.txt
@@ -1,3 +1,3 @@
-trytond_account_invoice >= 2.4, < 2.5
-trytond_analytic_account >= 2.4, < 2.5
-trytond >= 2.4, < 2.5
\ No newline at end of file
+trytond_account_invoice >= 2.6, < 2.7
+trytond_analytic_account >= 2.6, < 2.7
+trytond >= 2.6, < 2.7
\ No newline at end of file
commit 0a7dabd874c65f92df218c54ba6850ff24158cf3
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Apr 25 11:03:29 2012 +0200
Adding upstream version 2.4.1.
diff --git a/CHANGELOG b/CHANGELOG
index 875c8bf..dc330ba 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.4.1 - 2012-04-24
+* Restore es_AR translation
+
Version 2.4.0 - 2012-04-23
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index db0483c..070a6cb 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_analytic_invoice
-Version: 2.4.0
+Version: 2.4.1
Summary: Add analytic account on invoice lines and generate analytic lines on the moves of invoice.
Home-page: http://www.tryton.org/
diff --git a/__tryton__.py b/__tryton__.py
index 004ef9b..14f71ae 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -9,7 +9,7 @@
'name_es_CO': 'Facturación Analítica',
'name_es_ES': 'Facturación analítica',
'name_fr_FR': 'Facturation analytique',
- 'version': '2.4.0',
+ 'version': '2.4.1',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/locale/es_AR.po b/locale/es_AR.po
index 542f292..825e4f5 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -1,3 +1,7 @@
#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:account.invoice.line,analytic_accounts:"
+msgid "Analytic Accounts"
+msgstr "Cuentas analíticas"
diff --git a/trytond_analytic_invoice.egg-info/PKG-INFO b/trytond_analytic_invoice.egg-info/PKG-INFO
index e76698d..0630177 100644
--- a/trytond_analytic_invoice.egg-info/PKG-INFO
+++ b/trytond_analytic_invoice.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-analytic-invoice
-Version: 2.4.0
+Version: 2.4.1
Summary: Add analytic account on invoice lines and generate analytic lines on the moves of invoice.
Home-page: http://www.tryton.org/
commit 65d06bbaf7467a523c5d94709d2bd75b45ff8f2b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 24 19:30:37 2012 +0200
Adding upstream version 2.4.0.
diff --git a/CHANGELOG b/CHANGELOG
index 905eea5..875c8bf 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.4.0 - 2012-04-23
+* Bug fixes (see mercurial logs for details)
+
Version 2.2.0 - 2011-10-24
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 3d2324b..2057c72 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2011 Cédric Krier.
-Copyright (C) 2008-2011 Bertrand Chenal.
-Copyright (C) 2008-2011 B2CK SPRL.
+Copyright (C) 2008-2012 Cédric Krier.
+Copyright (C) 2008-2012 Bertrand Chenal.
+Copyright (C) 2008-2012 B2CK SPRL.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/INSTALL b/INSTALL
index 53bd980..4c54706 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_analytic_invoice
Prerequisites
-------------
- * Python 2.5 or later (http://www.python.org/)
+ * Python 2.6 or later (http://www.python.org/)
* trytond (http://www.tryton.org/)
* trytond_account_invoice (http://www.tryton.org/)
* trytond_analytic_account (http://www.tryton.org/)
diff --git a/PKG-INFO b/PKG-INFO
index dc946a1..db0483c 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,13 +1,13 @@
Metadata-Version: 1.0
Name: trytond_analytic_invoice
-Version: 2.2.0
+Version: 2.4.0
Summary: Add analytic account on invoice lines and generate analytic lines on the moves of invoice.
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.2/
+Download-URL: http://downloads.tryton.org/2.4/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/__init__.py b/__init__.py
index d415f1d..ef5b670 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,4 +1,4 @@
#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 invoice import *
+from .invoice import *
diff --git a/__tryton__.py b/__tryton__.py
index a04c27f..004ef9b 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -3,11 +3,13 @@
{
'name': 'Analytic Invoice',
'name_bg_BG': 'Аналитична фактура',
+ 'name_ca_ES': 'Facturació analítica',
'name_de_DE': 'Kostenstellen Rechnungsstellung',
+ 'name_es_AR': 'Facturación Analítica',
'name_es_CO': 'Facturación Analítica',
'name_es_ES': 'Facturación analítica',
'name_fr_FR': 'Facturation analytique',
- 'version': '2.2.0',
+ 'version': '2.4.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
@@ -15,14 +17,20 @@
''',
'description_bg_BG': ''' - Добавя аналитична сметна за редове на фактури и генерира аналитични редове за движения от фактура
''',
+ 'description_ca_ES': '''Afegeix un compte analític a les línies de factura
+i genera línies analítiques pels assentaments de la factura.
+''',
'description_de_DE': ''' - Fügt Kostenstellen zu Rechnungszeilen hinzu
- Erstellt Positionen für Kostenstellen bei Buchung von Rechnungen
''',
+ 'description_es_AR': '''Añade contabilidad analítica en las líneas de
+factura y genera líneas analíticas en los asientos de la factura.''',
'description_es_CO': ''' - Adición de contabilidad analítica a las líneas de facturación
- Generación de líneas analíticas en la factura.
''',
- 'description_es_ES': '''Añade una cuenta analítica en las líneas de '''
- '''factura y genera líneas analíticas en los asientos de la factura.''',
+ 'description_es_ES': '''Añade una cuenta analítica en las líneas de
+factura y genera líneas analíticas por los asientos de la factura.
+''',
'description_fr_FR': '''Ajoute la comptabilité analytique sur les lignes '''
'''de facture et génère les lignes analytiques sur les mouvements de la '''
'''facture.''',
@@ -36,8 +44,10 @@
],
'translation': [
'locale/bg_BG.po',
+ 'locale/ca_ES.po',
'locale/cs_CZ.po',
'locale/de_DE.po',
+ 'locale/es_AR.po',
'locale/es_CO.po',
'locale/es_ES.po',
'locale/fr_FR.po',
diff --git a/invoice.py b/invoice.py
index 17fa67c..dba287c 100644
--- a/invoice.py
+++ b/invoice.py
@@ -41,8 +41,6 @@ class InvoiceLine(ModelSQL, ModelView):
with_rec_name=with_rec_name)
def read(self, ids, fields_names=None):
- selection_obj = Pool().get('analytic_account.account.selection')
-
int_id = False
if isinstance(ids, (int, long)):
int_id = True
@@ -72,7 +70,7 @@ class InvoiceLine(ModelSQL, ModelView):
for line in lines:
for root_id in root_ids:
id2record[line.id]['analytic_account_' \
- + str(root_id)] = False
+ + str(root_id)] = None
if line.type != 'line':
continue
if not line.analytic_accounts:
@@ -221,21 +219,24 @@ class Account(ModelSQL, ModelView):
def delete(self, ids):
account_invoice_line_obj = Pool().get('account.invoice.line')
res = super(Account, self).delete(ids)
- # Restart the cache on the fields_view_get method of account.invoice.line
+ # Restart the cache on the fields_view_get method of
+ # account.invoice.line
account_invoice_line_obj.fields_view_get.reset()
return res
def create(self, vals):
account_invoice_line_obj = Pool().get('account.invoice.line')
res = super(Account, self).create(vals)
- # Restart the cache on the fields_view_get method of account.invoice.line
+ # Restart the cache on the fields_view_get method of
+ # account.invoice.line
account_invoice_line_obj.fields_view_get.reset()
return res
def write(self, ids, vals):
account_invoice_line_obj = Pool().get('account.invoice.line')
res = super(Account, self).write(ids, vals)
- # Restart the cache on the fields_view_get method of account.invoice.line
+ # Restart the cache on the fields_view_get method of
+ # account.invoice.line
account_invoice_line_obj.fields_view_get.reset()
return res
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index a6a5434..5716284 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -2,6 +2,6 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:account.invoice.line,analytic_accounts:0"
+msgctxt "field:account.invoice.line,analytic_accounts:"
msgid "Analytic Accounts"
msgstr "Аналитични сметки"
diff --git a/locale/nl_NL.po b/locale/ca_ES.po
similarity index 51%
copy from locale/nl_NL.po
copy to locale/ca_ES.po
index f73e5cf..6943cd3 100644
--- a/locale/nl_NL.po
+++ b/locale/ca_ES.po
@@ -2,6 +2,6 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:account.invoice.line,analytic_accounts:0"
+msgctxt "field:account.invoice.line,analytic_accounts:"
msgid "Analytic Accounts"
-msgstr ""
+msgstr "Comptes analítics"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index f73e5cf..1d3bd89 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -2,6 +2,6 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:account.invoice.line,analytic_accounts:0"
+msgctxt "field:account.invoice.line,analytic_accounts:"
msgid "Analytic Accounts"
msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 63e1de1..7ac1f90 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -2,6 +2,6 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:account.invoice.line,analytic_accounts:0"
+msgctxt "field:account.invoice.line,analytic_accounts:"
msgid "Analytic Accounts"
msgstr "Kostenstellen"
diff --git a/locale/es_AR.po b/locale/es_AR.po
new file mode 100644
index 0000000..542f292
--- /dev/null
+++ b/locale/es_AR.po
@@ -0,0 +1,3 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 1fb0f97..c2fb3e2 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -2,6 +2,6 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:account.invoice.line,analytic_accounts:0"
+msgctxt "field:account.invoice.line,analytic_accounts:"
msgid "Analytic Accounts"
msgstr "Cuentas Analíticas"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 28ec000..825e4f5 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -2,6 +2,6 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:account.invoice.line,analytic_accounts:0"
+msgctxt "field:account.invoice.line,analytic_accounts:"
msgid "Analytic Accounts"
msgstr "Cuentas analíticas"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 0aaed0b..d24b295 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -2,6 +2,6 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:account.invoice.line,analytic_accounts:0"
+msgctxt "field:account.invoice.line,analytic_accounts:"
msgid "Analytic Accounts"
msgstr "Comptes analytiques"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index f73e5cf..1d3bd89 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -2,6 +2,6 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:account.invoice.line,analytic_accounts:0"
+msgctxt "field:account.invoice.line,analytic_accounts:"
msgid "Analytic Accounts"
msgstr ""
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index f73e5cf..1d3bd89 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -2,6 +2,6 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "field:account.invoice.line,analytic_accounts:0"
+msgctxt "field:account.invoice.line,analytic_accounts:"
msgid "Analytic Accounts"
msgstr ""
diff --git a/setup.py b/setup.py
index c4f6693..9e77b5d 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ minor_version = int(minor_version)
requires = []
for dep in info.get('depends', []):
- if not re.match(r'(ir|res|workflow|webdav)(\W|$)', dep):
+ if not re.match(r'(ir|res|webdav)(\W|$)', dep):
requires.append('trytond_%s >= %s.%s, < %s.%s' %
(dep, major_version, minor_version, major_version,
minor_version + 1))
diff --git a/tests/__init__.py b/tests/__init__.py
index f977db0..caca5e3 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,4 +1,4 @@
#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 test_analytic_invoice import suite
+from .test_analytic_invoice import suite
diff --git a/tests/test_analytic_invoice.py b/tests/test_analytic_invoice.py
index b2c088f..f5929c5 100644
--- a/tests/test_analytic_invoice.py
+++ b/tests/test_analytic_invoice.py
@@ -2,7 +2,8 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-import sys, os
+import sys
+import os
DIR = os.path.abspath(os.path.normpath(os.path.join(__file__,
'..', '..', '..', '..', '..', 'trytond')))
if os.path.isdir(DIR):
@@ -33,6 +34,7 @@ class AnalyticInvoiceTestCase(unittest.TestCase):
'''
test_depends()
+
def suite():
suite = trytond.tests.test_tryton.suite()
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
diff --git a/trytond_analytic_invoice.egg-info/PKG-INFO b/trytond_analytic_invoice.egg-info/PKG-INFO
index 70f8ed4..e76698d 100644
--- a/trytond_analytic_invoice.egg-info/PKG-INFO
+++ b/trytond_analytic_invoice.egg-info/PKG-INFO
@@ -1,13 +1,13 @@
Metadata-Version: 1.0
Name: trytond-analytic-invoice
-Version: 2.2.0
+Version: 2.4.0
Summary: Add analytic account on invoice lines and generate analytic lines on the moves of invoice.
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.2/
+Download-URL: http://downloads.tryton.org/2.4/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_analytic_invoice.egg-info/SOURCES.txt b/trytond_analytic_invoice.egg-info/SOURCES.txt
index bfd16bf..7f3919e 100644
--- a/trytond_analytic_invoice.egg-info/SOURCES.txt
+++ b/trytond_analytic_invoice.egg-info/SOURCES.txt
@@ -12,8 +12,10 @@ setup.py
./tests/__init__.py
./tests/test_analytic_invoice.py
locale/bg_BG.po
+locale/ca_ES.po
locale/cs_CZ.po
locale/de_DE.po
+locale/es_AR.po
locale/es_CO.po
locale/es_ES.po
locale/fr_FR.po
diff --git a/trytond_analytic_invoice.egg-info/requires.txt b/trytond_analytic_invoice.egg-info/requires.txt
index 8853fbc..cddd009 100644
--- a/trytond_analytic_invoice.egg-info/requires.txt
+++ b/trytond_analytic_invoice.egg-info/requires.txt
@@ -1,3 +1,3 @@
-trytond_account_invoice >= 2.2, < 2.3
-trytond_analytic_account >= 2.2, < 2.3
-trytond >= 2.2, < 2.3
\ No newline at end of file
+trytond_account_invoice >= 2.4, < 2.5
+trytond_analytic_account >= 2.4, < 2.5
+trytond >= 2.4, < 2.5
\ No newline at end of file
commit d495fa63d3566f44b24366852fc75f9844f02eb1
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Oct 31 16:20:31 2011 +0100
Adding upstream version 2.2.0.
diff --git a/CHANGELOG b/CHANGELOG
index f74f0b3..905eea5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.0 - 2011-10-24
+* Bug fixes (see mercurial logs for details)
+
Version 2.0.0 - 2011-04-27
* Bug fixes (see mercurial logs for details)
diff --git a/MANIFEST.in b/MANIFEST.in
index 5343ad8..7f5d5fd 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,4 +6,4 @@ include CHANGELOG
include LICENSE
include *.xml
include *.odt
-include *.csv
+include locale/*.po
diff --git a/PKG-INFO b/PKG-INFO
index 0741569..dc946a1 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,28 +1,31 @@
Metadata-Version: 1.0
Name: trytond_analytic_invoice
-Version: 2.0.0
+Version: 2.2.0
Summary: Add analytic account on invoice lines and generate analytic lines on the moves of invoice.
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.0/
+Download-URL: http://downloads.tryton.org/2.2/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
+Classifier: Framework :: Tryton
Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Czech
+Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
+Classifier: Natural Language :: Russian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 2.5
Classifier: Programming Language :: Python :: 2.6
Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
diff --git a/__tryton__.py b/__tryton__.py
index f37bd0f..a04c27f 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -7,7 +7,7 @@
'name_es_CO': 'Facturación Analítica',
'name_es_ES': 'Facturación analítica',
'name_fr_FR': 'Facturation analytique',
- 'version': '2.0.0',
+ 'version': '2.2.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
@@ -18,7 +18,7 @@
'description_de_DE': ''' - Fügt Kostenstellen zu Rechnungszeilen hinzu
- Erstellt Positionen für Kostenstellen bei Buchung von Rechnungen
''',
- 'description_es_CO': ''' - Adición de contabilidad analítica a las líneas de facturación
+ 'description_es_CO': ''' - Adición de contabilidad analítica a las líneas de facturación
- Generación de líneas analíticas en la factura.
''',
'description_es_ES': '''Añade una cuenta analítica en las líneas de '''
@@ -35,10 +35,13 @@
'invoice.xml',
],
'translation': [
- 'bg_BG.csv',
- 'de_DE.csv',
- 'es_CO.csv',
- 'es_ES.csv',
- 'fr_FR.csv',
+ 'locale/bg_BG.po',
+ 'locale/cs_CZ.po',
+ 'locale/de_DE.po',
+ 'locale/es_CO.po',
+ 'locale/es_ES.po',
+ 'locale/fr_FR.po',
+ 'locale/nl_NL.po',
+ 'locale/ru_RU.po',
],
}
diff --git a/bg_BG.csv b/bg_BG.csv
deleted file mode 100644
index 6108a14..0000000
--- a/bg_BG.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-type,name,res_id,src,value,fuzzy
-field,"account.invoice.line,analytic_accounts",0,Analytic Accounts,Аналитични сметки,0
diff --git a/de_DE.csv b/de_DE.csv
deleted file mode 100644
index 3de2537..0000000
--- a/de_DE.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-type,name,res_id,src,value,fuzzy
-field,"account.invoice.line,analytic_accounts",0,Analytic Accounts,Kostenstellen,0
diff --git a/es_CO.csv b/es_CO.csv
deleted file mode 100644
index 0e71661..0000000
--- a/es_CO.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-type,name,res_id,src,value,fuzzy
-field,"account.invoice.line,analytic_accounts",0,Analytic Accounts,Cuentas Analíticas,0
diff --git a/es_ES.csv b/es_ES.csv
deleted file mode 100644
index 8750e2e..0000000
--- a/es_ES.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-type,name,res_id,src,value,fuzzy
-field,"account.invoice.line,analytic_accounts",0,Analytic Accounts,Cuentas analíticas,0
diff --git a/fr_FR.csv b/fr_FR.csv
deleted file mode 100644
index a64dce4..0000000
--- a/fr_FR.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-type,name,res_id,src,value,fuzzy
-field,"account.invoice.line,analytic_accounts",0,Analytic Accounts,Comptes analytiques,0
diff --git a/invoice.py b/invoice.py
index b85c5f3..17fa67c 100644
--- a/invoice.py
+++ b/invoice.py
@@ -1,29 +1,30 @@
#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 with_statement
from trytond.model import ModelView, ModelSQL, fields
-from trytond.pyson import Not, Equal, Eval
+from trytond.pyson import Eval
from trytond.transaction import Transaction
+from trytond.pool import Pool
class InvoiceLine(ModelSQL, ModelView):
_name = 'account.invoice.line'
analytic_accounts = fields.Many2One('analytic_account.account.selection',
- 'Analytic Accounts',
- states={
- 'invisible': Not(Equal(Eval('type'), 'line')),
- })
+ 'Analytic Accounts',
+ states={
+ 'invisible': Eval('type') != 'line',
+ },
+ depends=['type'])
def _view_look_dom_arch(self, tree, type, field_children=None):
- analytic_account_obj = self.pool.get('analytic_account.account')
+ analytic_account_obj = Pool().get('analytic_account.account')
analytic_account_obj.convert_view(tree)
arch, fields = super(InvoiceLine, self)._view_look_dom_arch(tree, type,
field_children=field_children)
return arch, fields
def fields_get(self, fields_names=None):
- analytic_account_obj = self.pool.get('analytic_account.account')
+ analytic_account_obj = Pool().get('analytic_account.account')
res = super(InvoiceLine, self).fields_get(fields_names)
@@ -34,8 +35,13 @@ class InvoiceLine(ModelSQL, ModelView):
analytic_accounts_field, fields_names))
return res
+ def default_get(self, fields, with_rec_name=True):
+ fields = [x for x in fields if not x.startswith('analytic_account_')]
+ return super(InvoiceLine, self).default_get(fields,
+ with_rec_name=with_rec_name)
+
def read(self, ids, fields_names=None):
- selection_obj = self.pool.get('analytic_account.account.selection')
+ selection_obj = Pool().get('analytic_account.account.selection')
int_id = False
if isinstance(ids, (int, long)):
@@ -85,7 +91,7 @@ class InvoiceLine(ModelSQL, ModelView):
return res
def create(self, vals):
- selection_obj = self.pool.get('analytic_account.account.selection')
+ selection_obj = Pool().get('analytic_account.account.selection')
vals = vals.copy()
selection_vals = {}
for field in vals.keys():
@@ -102,7 +108,7 @@ class InvoiceLine(ModelSQL, ModelView):
return super(InvoiceLine, self).create(vals)
def write(self, ids, vals):
- selection_obj = self.pool.get('analytic_account.account.selection')
+ selection_obj = Pool().get('analytic_account.account.selection')
vals = vals.copy()
if isinstance(ids, (int, long)):
ids = [ids]
@@ -143,7 +149,7 @@ class InvoiceLine(ModelSQL, ModelView):
return super(InvoiceLine, self).write(ids, vals)
def delete(self, ids):
- selection_obj = self.pool.get('analytic_account.account.selection')
+ selection_obj = Pool().get('analytic_account.account.selection')
if isinstance(ids, (int, long)):
ids = [ids]
@@ -158,7 +164,7 @@ class InvoiceLine(ModelSQL, ModelView):
return res
def copy(self, ids, default=None):
- selection_obj = self.pool.get('analytic_account.account.selection')
+ selection_obj = Pool().get('analytic_account.account.selection')
new_ids = super(InvoiceLine, self).copy(ids, default=default)
@@ -178,6 +184,16 @@ class InvoiceLine(ModelSQL, ModelView):
return new_ids[0]
return new_ids
+ def _credit(self, line):
+ selection_obj = Pool().get('analytic_account.account.selection')
+
+ result = super(InvoiceLine, self)._credit(line)
+
+ if line.analytic_accounts:
+ selection_id = selection_obj.copy(line.analytic_accounts.id)
+ result['analytic_accounts'] = selection_id
+ return result
+
def get_move_line(self, line):
values = super(InvoiceLine, self).get_move_line(line)
if line.analytic_accounts and line.analytic_accounts.accounts:
@@ -203,21 +219,21 @@ class Account(ModelSQL, ModelView):
_name = 'analytic_account.account'
def delete(self, ids):
- account_invoice_line_obj = self.pool.get('account.invoice.line')
+ account_invoice_line_obj = Pool().get('account.invoice.line')
res = super(Account, self).delete(ids)
# Restart the cache on the fields_view_get method of account.invoice.line
account_invoice_line_obj.fields_view_get.reset()
return res
def create(self, vals):
- account_invoice_line_obj = self.pool.get('account.invoice.line')
+ account_invoice_line_obj = Pool().get('account.invoice.line')
res = super(Account, self).create(vals)
# Restart the cache on the fields_view_get method of account.invoice.line
account_invoice_line_obj.fields_view_get.reset()
return res
def write(self, ids, vals):
- account_invoice_line_obj = self.pool.get('account.invoice.line')
+ account_invoice_line_obj = Pool().get('account.invoice.line')
res = super(Account, self).write(ids, vals)
# Restart the cache on the fields_view_get method of account.invoice.line
account_invoice_line_obj.fields_view_get.reset()
diff --git a/invoice.xml b/invoice.xml
index 2a476ca..7509e7f 100644
--- a/invoice.xml
+++ b/invoice.xml
@@ -10,7 +10,7 @@ this repository contains the full copyright notices and license terms. -->
<![CDATA[
<data>
<xpath
- expr="/form/notebook/page/separator[@name="taxes"]"
+ expr="/form/notebook/page/field[@name="taxes"]"
position="before">
<group col="4" colspan="4" name="analytic_accounts">
<field name="analytic_accounts"/>
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
new file mode 100644
index 0000000..a6a5434
--- /dev/null
+++ b/locale/bg_BG.po
@@ -0,0 +1,7 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:account.invoice.line,analytic_accounts:0"
+msgid "Analytic Accounts"
+msgstr "Аналитични сметки"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
new file mode 100644
index 0000000..f73e5cf
--- /dev/null
+++ b/locale/cs_CZ.po
@@ -0,0 +1,7 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:account.invoice.line,analytic_accounts:0"
+msgid "Analytic Accounts"
+msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
new file mode 100644
index 0000000..63e1de1
--- /dev/null
+++ b/locale/de_DE.po
@@ -0,0 +1,7 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:account.invoice.line,analytic_accounts:0"
+msgid "Analytic Accounts"
+msgstr "Kostenstellen"
diff --git a/locale/es_CO.po b/locale/es_CO.po
new file mode 100644
index 0000000..1fb0f97
--- /dev/null
+++ b/locale/es_CO.po
@@ -0,0 +1,7 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:account.invoice.line,analytic_accounts:0"
+msgid "Analytic Accounts"
+msgstr "Cuentas Analíticas"
diff --git a/locale/es_ES.po b/locale/es_ES.po
new file mode 100644
index 0000000..28ec000
--- /dev/null
+++ b/locale/es_ES.po
@@ -0,0 +1,7 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:account.invoice.line,analytic_accounts:0"
+msgid "Analytic Accounts"
+msgstr "Cuentas analíticas"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
new file mode 100644
index 0000000..0aaed0b
--- /dev/null
+++ b/locale/fr_FR.po
@@ -0,0 +1,7 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:account.invoice.line,analytic_accounts:0"
+msgid "Analytic Accounts"
+msgstr "Comptes analytiques"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
new file mode 100644
index 0000000..f73e5cf
--- /dev/null
+++ b/locale/nl_NL.po
@@ -0,0 +1,7 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:account.invoice.line,analytic_accounts:0"
+msgid "Analytic Accounts"
+msgstr ""
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
new file mode 100644
index 0000000..f73e5cf
--- /dev/null
+++ b/locale/ru_RU.po
@@ -0,0 +1,7 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:account.invoice.line,analytic_accounts:0"
+msgid "Analytic Accounts"
+msgstr ""
diff --git a/setup.py b/setup.py
index fb82478..c4f6693 100644
--- a/setup.py
+++ b/setup.py
@@ -39,17 +39,20 @@ setup(name='trytond_analytic_invoice',
classifiers=[
'Development Status :: 5 - Production/Stable',
'Environment :: Plugins',
+ 'Framework :: Tryton',
'Intended Audience :: Developers',
'Intended Audience :: Financial and Insurance Industry',
'Intended Audience :: Legal Industry',
'License :: OSI Approved :: GNU General Public License (GPL)',
'Natural Language :: Bulgarian',
+ 'Natural Language :: Czech',
+ 'Natural Language :: Dutch',
'Natural Language :: English',
'Natural Language :: French',
'Natural Language :: German',
+ 'Natural Language :: Russian',
'Natural Language :: Spanish',
'Operating System :: OS Independent',
- 'Programming Language :: Python :: 2.5',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Topic :: Office/Business',
diff --git a/tests/test_analytic_invoice.py b/tests/test_analytic_invoice.py
index b8eaf33..b2c088f 100644
--- a/tests/test_analytic_invoice.py
+++ b/tests/test_analytic_invoice.py
@@ -10,7 +10,7 @@ if os.path.isdir(DIR):
import unittest
import trytond.tests.test_tryton
-from trytond.tests.test_tryton import test_view
+from trytond.tests.test_tryton import test_view, test_depends
class AnalyticInvoiceTestCase(unittest.TestCase):
@@ -27,6 +27,12 @@ class AnalyticInvoiceTestCase(unittest.TestCase):
'''
test_view('analytic_invoice')
+ def test0006depends(self):
+ '''
+ Test depends.
+ '''
+ test_depends()
+
def suite():
suite = trytond.tests.test_tryton.suite()
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
diff --git a/trytond_analytic_invoice.egg-info/PKG-INFO b/trytond_analytic_invoice.egg-info/PKG-INFO
index e8e9d17..70f8ed4 100644
--- a/trytond_analytic_invoice.egg-info/PKG-INFO
+++ b/trytond_analytic_invoice.egg-info/PKG-INFO
@@ -1,28 +1,31 @@
Metadata-Version: 1.0
Name: trytond-analytic-invoice
-Version: 2.0.0
+Version: 2.2.0
Summary: Add analytic account on invoice lines and generate analytic lines on the moves of invoice.
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.0/
+Download-URL: http://downloads.tryton.org/2.2/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
+Classifier: Framework :: Tryton
Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Czech
+Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
+Classifier: Natural Language :: Russian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 2.5
Classifier: Programming Language :: Python :: 2.6
Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
diff --git a/trytond_analytic_invoice.egg-info/SOURCES.txt b/trytond_analytic_invoice.egg-info/SOURCES.txt
index 59ccf91..bfd16bf 100644
--- a/trytond_analytic_invoice.egg-info/SOURCES.txt
+++ b/trytond_analytic_invoice.egg-info/SOURCES.txt
@@ -4,11 +4,6 @@ INSTALL
LICENSE
MANIFEST.in
README
-bg_BG.csv
-de_DE.csv
-es_CO.csv
-es_ES.csv
-fr_FR.csv
invoice.xml
setup.py
./__init__.py
@@ -16,6 +11,14 @@ setup.py
./invoice.py
./tests/__init__.py
./tests/test_analytic_invoice.py
+locale/bg_BG.po
+locale/cs_CZ.po
+locale/de_DE.po
+locale/es_CO.po
+locale/es_ES.po
+locale/fr_FR.po
+locale/nl_NL.po
+locale/ru_RU.po
trytond_analytic_invoice.egg-info/PKG-INFO
trytond_analytic_invoice.egg-info/SOURCES.txt
trytond_analytic_invoice.egg-info/dependency_links.txt
diff --git a/trytond_analytic_invoice.egg-info/requires.txt b/trytond_analytic_invoice.egg-info/requires.txt
index 1ce5496..8853fbc 100644
--- a/trytond_analytic_invoice.egg-info/requires.txt
+++ b/trytond_analytic_invoice.egg-info/requires.txt
@@ -1,3 +1,3 @@
-trytond_account_invoice >= 2.0, < 2.1
-trytond_analytic_account >= 2.0, < 2.1
-trytond >= 2.0, < 2.1
\ No newline at end of file
+trytond_account_invoice >= 2.2, < 2.3
+trytond_analytic_account >= 2.2, < 2.3
+trytond >= 2.2, < 2.3
\ No newline at end of file
commit 272ae9b9007f9acddaae9e952436987a5068eaa9
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue May 24 19:12:41 2011 +0200
Adding upstream version 2.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 29d9fb1..f74f0b3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.0.0 - 2011-04-27
+* Bug fixes (see mercurial logs for details)
+
Version 1.8.0 - 2010-11-01
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index cca7db9..3d2324b 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2010 Cédric Krier.
-Copyright (C) 2008-2010 Bertrand Chenal.
-Copyright (C) 2008-2010 B2CK SPRL.
+Copyright (C) 2008-2011 Cédric Krier.
+Copyright (C) 2008-2011 Bertrand Chenal.
+Copyright (C) 2008-2011 B2CK SPRL.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/PKG-INFO b/PKG-INFO
index 6a9394b..0741569 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,13 +1,13 @@
Metadata-Version: 1.0
Name: trytond_analytic_invoice
-Version: 1.8.0
+Version: 2.0.0
Summary: Add analytic account on invoice lines and generate analytic lines on the moves of invoice.
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.8/
+Download-URL: http://downloads.tryton.org/2.0/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
@@ -16,11 +16,14 @@ Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2.5
+Classifier: Programming Language :: Python :: 2.6
+Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
Classifier: Topic :: Office/Business :: Financial :: Accounting
diff --git a/__tryton__.py b/__tryton__.py
index e0c4c1d..f37bd0f 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -2,16 +2,19 @@
#this repository contains the full copyright notices and license terms.
{
'name': 'Analytic Invoice',
+ 'name_bg_BG': 'Аналитична фактура',
'name_de_DE': 'Kostenstellen Rechnungsstellung',
'name_es_CO': 'Facturación Analítica',
'name_es_ES': 'Facturación analítica',
'name_fr_FR': 'Facturation analytique',
- 'version': '1.8.0',
+ 'version': '2.0.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
'description': '''Add analytic account on invoice lines and generate analytic lines on the moves of invoice.
''',
+ 'description_bg_BG': ''' - Добавя аналитична сметна за редове на фактури и генерира аналитични редове за движения от фактура
+''',
'description_de_DE': ''' - Fügt Kostenstellen zu Rechnungszeilen hinzu
- Erstellt Positionen für Kostenstellen bei Buchung von Rechnungen
''',
@@ -32,6 +35,7 @@
'invoice.xml',
],
'translation': [
+ 'bg_BG.csv',
'de_DE.csv',
'es_CO.csv',
'es_ES.csv',
diff --git a/bg_BG.csv b/bg_BG.csv
new file mode 100644
index 0000000..6108a14
--- /dev/null
+++ b/bg_BG.csv
@@ -0,0 +1,2 @@
+type,name,res_id,src,value,fuzzy
+field,"account.invoice.line,analytic_accounts",0,Analytic Accounts,Аналитични сметки,0
diff --git a/invoice.py b/invoice.py
index 4af1bfc..b85c5f3 100644
--- a/invoice.py
+++ b/invoice.py
@@ -15,10 +15,11 @@ class InvoiceLine(ModelSQL, ModelView):
'invisible': Not(Equal(Eval('type'), 'line')),
})
- def _view_look_dom_arch(self, tree, type):
+ def _view_look_dom_arch(self, tree, type, field_children=None):
analytic_account_obj = self.pool.get('analytic_account.account')
analytic_account_obj.convert_view(tree)
- arch, fields = super(InvoiceLine, self)._view_look_dom_arch(tree, type)
+ arch, fields = super(InvoiceLine, self)._view_look_dom_arch(tree, type,
+ field_children=field_children)
return arch, fields
def fields_get(self, fields_names=None):
@@ -178,21 +179,22 @@ class InvoiceLine(ModelSQL, ModelView):
return new_ids
def get_move_line(self, line):
- res = super(InvoiceLine, self).get_move_line(line)
+ values = super(InvoiceLine, self).get_move_line(line)
if line.analytic_accounts and line.analytic_accounts.accounts:
- res['analytic_lines'] = []
- for account in line.analytic_accounts.accounts:
- vals = {}
- vals['name'] = line.description
- vals['debit'] = res['debit']
- vals['credit'] = res['credit']
- vals['account'] = account.id
- vals['journal'] = line.invoice.journal.id
- vals['date'] = line.invoice.invoice_date
- vals['reference'] = line.invoice.reference
- vals['party'] = line.invoice.party.id
- res['analytic_lines'].append(('create', vals))
- return res
+ for value in values:
+ value['analytic_lines'] = []
+ for account in line.analytic_accounts.accounts:
+ vals = {}
+ vals['name'] = line.description
+ vals['debit'] = value['debit']
+ vals['credit'] = value['credit']
+ vals['account'] = account.id
+ vals['journal'] = line.invoice.journal.id
+ vals['date'] = line.invoice.invoice_date
+ vals['reference'] = line.invoice.reference
+ vals['party'] = line.invoice.party.id
+ value['analytic_lines'].append(('create', vals))
+ return values
InvoiceLine()
diff --git a/setup.py b/setup.py
index 8e44c05..fb82478 100644
--- a/setup.py
+++ b/setup.py
@@ -43,12 +43,15 @@ setup(name='trytond_analytic_invoice',
'Intended Audience :: Financial and Insurance Industry',
'Intended Audience :: Legal Industry',
'License :: OSI Approved :: GNU General Public License (GPL)',
+ 'Natural Language :: Bulgarian',
'Natural Language :: English',
'Natural Language :: French',
'Natural Language :: German',
'Natural Language :: Spanish',
'Operating System :: OS Independent',
- 'Programming Language :: Python',
+ 'Programming Language :: Python :: 2.5',
+ 'Programming Language :: Python :: 2.6',
+ 'Programming Language :: Python :: 2.7',
'Topic :: Office/Business',
'Topic :: Office/Business :: Financial :: Accounting',
],
diff --git a/trytond_analytic_invoice.egg-info/PKG-INFO b/trytond_analytic_invoice.egg-info/PKG-INFO
index 6b22242..e8e9d17 100644
--- a/trytond_analytic_invoice.egg-info/PKG-INFO
+++ b/trytond_analytic_invoice.egg-info/PKG-INFO
@@ -1,13 +1,13 @@
Metadata-Version: 1.0
Name: trytond-analytic-invoice
-Version: 1.8.0
+Version: 2.0.0
Summary: Add analytic account on invoice lines and generate analytic lines on the moves of invoice.
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.8/
+Download-URL: http://downloads.tryton.org/2.0/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
@@ -16,11 +16,14 @@ Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2.5
+Classifier: Programming Language :: Python :: 2.6
+Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
Classifier: Topic :: Office/Business :: Financial :: Accounting
diff --git a/trytond_analytic_invoice.egg-info/SOURCES.txt b/trytond_analytic_invoice.egg-info/SOURCES.txt
index b615c3f..59ccf91 100644
--- a/trytond_analytic_invoice.egg-info/SOURCES.txt
+++ b/trytond_analytic_invoice.egg-info/SOURCES.txt
@@ -4,6 +4,7 @@ INSTALL
LICENSE
MANIFEST.in
README
+bg_BG.csv
de_DE.csv
es_CO.csv
es_ES.csv
diff --git a/trytond_analytic_invoice.egg-info/requires.txt b/trytond_analytic_invoice.egg-info/requires.txt
index 860d8e4..1ce5496 100644
--- a/trytond_analytic_invoice.egg-info/requires.txt
+++ b/trytond_analytic_invoice.egg-info/requires.txt
@@ -1,3 +1,3 @@
-trytond_account_invoice >= 1.8, < 1.9
-trytond_analytic_account >= 1.8, < 1.9
-trytond >= 1.8, < 1.9
\ No newline at end of file
+trytond_account_invoice >= 2.0, < 2.1
+trytond_analytic_account >= 2.0, < 2.1
+trytond >= 2.0, < 2.1
\ No newline at end of file
commit 626ec9011325de3c0afa34d0eade1d54e1e0f356
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Nov 4 20:12:08 2010 +0100
Adding upstream version 1.8.0.
diff --git a/CHANGELOG b/CHANGELOG
index e36b38a..29d9fb1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 1.8.0 - 2010-11-01
+* Bug fixes (see mercurial logs for details)
+
Version 1.6.0 - 2010-05-13
* Bug fixes (see mercurial logs for details)
diff --git a/INSTALL b/INSTALL
index d9f4210..53bd980 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_analytic_invoice
Prerequisites
-------------
- * Python 2.4 or later (http://www.python.org/)
+ * Python 2.5 or later (http://www.python.org/)
* trytond (http://www.tryton.org/)
* trytond_account_invoice (http://www.tryton.org/)
* trytond_analytic_account (http://www.tryton.org/)
diff --git a/PKG-INFO b/PKG-INFO
index 29d8c26..6a9394b 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,13 +1,13 @@
Metadata-Version: 1.0
Name: trytond_analytic_invoice
-Version: 1.6.0
+Version: 1.8.0
Summary: Add analytic account on invoice lines and generate analytic lines on the moves of invoice.
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.6/
+Download-URL: http://downloads.tryton.org/1.8/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/__tryton__.py b/__tryton__.py
index 0515ee7..e0c4c1d 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -6,7 +6,7 @@
'name_es_CO': 'Facturación Analítica',
'name_es_ES': 'Facturación analítica',
'name_fr_FR': 'Facturation analytique',
- 'version': '1.6.0',
+ 'version': '1.8.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/invoice.py b/invoice.py
index dad3475..4af1bfc 100644
--- a/invoice.py
+++ b/invoice.py
@@ -1,8 +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.
-"Invoice"
+from __future__ import with_statement
from trytond.model import ModelView, ModelSQL, fields
from trytond.pyson import Not, Equal, Eval
+from trytond.transaction import Transaction
class InvoiceLine(ModelSQL, ModelView):
@@ -14,28 +15,25 @@ class InvoiceLine(ModelSQL, ModelView):
'invisible': Not(Equal(Eval('type'), 'line')),
})
- def _view_look_dom_arch(self, cursor, user, tree, type, context=None):
+ def _view_look_dom_arch(self, tree, type):
analytic_account_obj = self.pool.get('analytic_account.account')
- analytic_account_obj.convert_view(cursor, user, tree, context=context)
- arch, fields = super(InvoiceLine, self)._view_look_dom_arch(cursor,
- user, tree, type, context=context)
+ analytic_account_obj.convert_view(tree)
+ arch, fields = super(InvoiceLine, self)._view_look_dom_arch(tree, type)
return arch, fields
- def fields_get(self, cursor, user, fields_names=None, context=None):
+ def fields_get(self, fields_names=None):
analytic_account_obj = self.pool.get('analytic_account.account')
- res = super(InvoiceLine, self).fields_get(cursor, user, fields_names,
- context=context)
+ res = super(InvoiceLine, self).fields_get(fields_names)
- analytic_accounts_field = super(InvoiceLine, self).fields_get(cursor,
- user, ['analytic_accounts'],
- context=context)['analytic_accounts']
+ analytic_accounts_field = super(InvoiceLine, self).fields_get(
+ ['analytic_accounts'])['analytic_accounts']
- res.update(analytic_account_obj.analytic_accounts_fields_get(cursor,
- user, analytic_accounts_field, fields_names, context=context))
+ res.update(analytic_account_obj.analytic_accounts_fields_get(
+ analytic_accounts_field, fields_names))
return res
- def read(self, cursor, user, ids, fields_names=None, context=None):
+ def read(self, ids, fields_names=None):
selection_obj = self.pool.get('analytic_account.account.selection')
int_id = False
@@ -49,8 +47,7 @@ class InvoiceLine(ModelSQL, ModelView):
else:
fields_names2 = fields_names
- res = super(InvoiceLine, self).read(cursor, user, ids,
- fields_names=fields_names2, context=context)
+ res = super(InvoiceLine, self).read(ids, fields_names=fields_names2)
if not fields_names:
fields_names = list(set(self._columns.keys() \
@@ -64,8 +61,11 @@ class InvoiceLine(ModelSQL, ModelView):
id2record = {}
for record in res:
id2record[record['id']] = record
- lines = self.browse(cursor, user, ids, context=context)
+ lines = self.browse(ids)
for line in lines:
+ for root_id in root_ids:
+ id2record[line.id]['analytic_account_' \
+ + str(root_id)] = False
if line.type != 'line':
continue
if not line.analytic_accounts:
@@ -83,7 +83,7 @@ class InvoiceLine(ModelSQL, ModelView):
return res[0]
return res
- def create(self, cursor, user, vals, context=None):
+ def create(self, vals):
selection_obj = self.pool.get('analytic_account.account.selection')
vals = vals.copy()
selection_vals = {}
@@ -94,16 +94,13 @@ class InvoiceLine(ModelSQL, ModelView):
selection_vals['accounts'].append(('add', vals[field]))
del vals[field]
if vals.get('analytic_accounts'):
- selection_obj.write(cursor, user, vals['analytic_accounts'],
- selection_vals, context=context)
+ selection_obj.write(vals['analytic_accounts'], selection_vals)
elif vals.get('type', 'line') == 'line':
- selection_id = selection_obj.create(cursor, user, selection_vals,
- context=context)
+ selection_id = selection_obj.create(selection_vals)
vals['analytic_accounts'] = selection_id
- return super(InvoiceLine, self).create(cursor, user, vals,
- context=context)
+ return super(InvoiceLine, self).create(vals)
- def write(self, cursor, user, ids, vals, context=None):
+ def write(self, ids, vals):
selection_obj = self.pool.get('analytic_account.account.selection')
vals = vals.copy()
if isinstance(ids, (int, long)):
@@ -115,19 +112,19 @@ class InvoiceLine(ModelSQL, ModelView):
selection_vals[root_id] = vals[field]
del vals[field]
if selection_vals:
- lines = self.browse(cursor, user, ids, context=context)
+ lines = self.browse(ids)
for line in lines:
if line.type != 'line':
continue
accounts = []
if not line.analytic_accounts:
# Create missing selection
- selection_id = selection_obj.create(cursor, 0, {},
- context=context)
- self.write(cursor, user, line.id, {
+ with Transaction().set_user(0):
+ selection_id = selection_obj.create({})
+ self.write(line.id, {
'analytic_accounts': selection_id,
- }, context=context)
- line = self.browse(cursor, user, line.id, context=context)
+ })
+ line = self.browse(line.id)
for account in line.analytic_accounts.accounts:
if account.root.id in selection_vals:
value = selection_vals[account.root.id]
@@ -139,54 +136,49 @@ class InvoiceLine(ModelSQL, ModelView):
if account_id \
and account_id not in accounts:
accounts.append(account_id)
- selection_obj.write(cursor, user, line.analytic_accounts.id, {
+ selection_obj.write(line.analytic_accounts.id, {
'accounts': [('set', accounts)],
- }, context=context)
- return super(InvoiceLine, self).write(cursor, user, ids, vals,
- context=context)
+ })
+ return super(InvoiceLine, self).write(ids, vals)
- def delete(self, cursor, user, ids, context=None):
+ def delete(self, ids):
selection_obj = self.pool.get('analytic_account.account.selection')
if isinstance(ids, (int, long)):
ids = [ids]
selection_ids = []
- lines = self.browse(cursor, user, ids, context=context)
+ lines = self.browse(ids)
for line in lines:
if line.analytic_accounts:
selection_ids.append(line.analytic_accounts.id)
- res = super(InvoiceLine, self).delete(cursor, user, ids,
- context=context)
- selection_obj.delete(cursor, user, selection_ids, context=context)
+ res = super(InvoiceLine, self).delete(ids)
+ selection_obj.delete(selection_ids)
return res
- def copy(self, cursor, user, ids, default=None, context=None):
+ def copy(self, ids, default=None):
selection_obj = self.pool.get('analytic_account.account.selection')
- new_ids = super(InvoiceLine, self).copy(cursor, user, ids,
- default=default, context=context)
+ new_ids = super(InvoiceLine, self).copy(ids, default=default)
int_id = False
if isinstance(new_ids, (int, long)):
int_id = True
new_ids = [new_ids]
- for line in self.browse(cursor, user, new_ids, context=context):
+ for line in self.browse(new_ids):
if line.analytic_accounts:
- selection_id = selection_obj.copy(cursor, user,
- line.analytic_accounts.id, context=context)
- self.write(cursor, user, line.id, {
+ selection_id = selection_obj.copy(line.analytic_accounts.id)
+ self.write(line.id, {
'analytic_accounts': selection_id,
- }, context=context)
+ })
if int_id:
return new_ids[0]
return new_ids
- def get_move_line(self, cursor, user, line, context=None):
- res = super(InvoiceLine, self).get_move_line(cursor, user, line,
- context=context)
+ def get_move_line(self, line):
+ res = super(InvoiceLine, self).get_move_line(line)
if line.analytic_accounts and line.analytic_accounts.accounts:
res['analytic_lines'] = []
for account in line.analytic_accounts.accounts:
@@ -208,26 +200,25 @@ InvoiceLine()
class Account(ModelSQL, ModelView):
_name = 'analytic_account.account'
- def delete(self, cursor, user, ids, context=None):
+ def delete(self, ids):
account_invoice_line_obj = self.pool.get('account.invoice.line')
- res = super(Account, self).delete(cursor, user, ids, context=context)
+ res = super(Account, self).delete(ids)
# Restart the cache on the fields_view_get method of account.invoice.line
- account_invoice_line_obj.fields_view_get(cursor.dbname)
+ account_invoice_line_obj.fields_view_get.reset()
return res
- def create(self, cursor, user, vals, context=None):
+ def create(self, vals):
account_invoice_line_obj = self.pool.get('account.invoice.line')
- res = super(Account, self).create(cursor, user, vals, context=context)
+ res = super(Account, self).create(vals)
# Restart the cache on the fields_view_get method of account.invoice.line
- account_invoice_line_obj.fields_view_get(cursor.dbname)
+ account_invoice_line_obj.fields_view_get.reset()
return res
- def write(self, cursor, user, ids, vals, context=None):
+ def write(self, ids, vals):
account_invoice_line_obj = self.pool.get('account.invoice.line')
- res = super(Account, self).write(cursor, user, ids, vals,
- context=context)
+ res = super(Account, self).write(ids, vals)
# Restart the cache on the fields_view_get method of account.invoice.line
- account_invoice_line_obj.fields_view_get(cursor.dbname)
+ account_invoice_line_obj.fields_view_get.reset()
return res
Account()
diff --git a/tests/test_analytic_invoice.py b/tests/test_analytic_invoice.py
index bd75423..b8eaf33 100644
--- a/tests/test_analytic_invoice.py
+++ b/tests/test_analytic_invoice.py
@@ -25,7 +25,7 @@ class AnalyticInvoiceTestCase(unittest.TestCase):
'''
Test views.
'''
- self.assertRaises(Exception, test_view('analytic_invoice'))
+ test_view('analytic_invoice')
def suite():
suite = trytond.tests.test_tryton.suite()
diff --git a/trytond_analytic_invoice.egg-info/PKG-INFO b/trytond_analytic_invoice.egg-info/PKG-INFO
index a69bd24..6b22242 100644
--- a/trytond_analytic_invoice.egg-info/PKG-INFO
+++ b/trytond_analytic_invoice.egg-info/PKG-INFO
@@ -1,13 +1,13 @@
Metadata-Version: 1.0
Name: trytond-analytic-invoice
-Version: 1.6.0
+Version: 1.8.0
Summary: Add analytic account on invoice lines and generate analytic lines on the moves of invoice.
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.6/
+Download-URL: http://downloads.tryton.org/1.8/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_analytic_invoice.egg-info/requires.txt b/trytond_analytic_invoice.egg-info/requires.txt
index 475c704..860d8e4 100644
--- a/trytond_analytic_invoice.egg-info/requires.txt
+++ b/trytond_analytic_invoice.egg-info/requires.txt
@@ -1,3 +1,3 @@
-trytond_account_invoice >= 1.6, < 1.7
-trytond_analytic_account >= 1.6, < 1.7
-trytond >= 1.6, < 1.7
\ No newline at end of file
+trytond_account_invoice >= 1.8, < 1.9
+trytond_analytic_account >= 1.8, < 1.9
+trytond >= 1.8, < 1.9
\ No newline at end of file
commit f085f38668e0115fc652b92f67cdc985325f8eb7
Author: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Date: Thu May 13 20:41:25 2010 +0200
Adding upstream version 1.6.0.
diff --git a/CHANGELOG b/CHANGELOG
index b4765f1..e36b38a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 1.6.0 - 2010-05-13
+* Bug fixes (see mercurial logs for details)
+
Version 1.4.0 - 2009-10-19
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 853f1f7..cca7db9 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,6 @@
-Copyright (C) 2008-2009 Cédric Krier.
-Copyright (C) 2008-2009 B2CK SPRL.
+Copyright (C) 2008-2010 Cédric Krier.
+Copyright (C) 2008-2010 Bertrand Chenal.
+Copyright (C) 2008-2010 B2CK SPRL.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/MANIFEST.in b/MANIFEST.in
index c61b52d..5343ad8 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -7,4 +7,3 @@ include LICENSE
include *.xml
include *.odt
include *.csv
-include tests/*
diff --git a/PKG-INFO b/PKG-INFO
index dcf0876..29d8c26 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,13 +1,13 @@
Metadata-Version: 1.0
Name: trytond_analytic_invoice
-Version: 1.4.0
+Version: 1.6.0
Summary: Add analytic account on invoice lines and generate analytic lines on the moves of invoice.
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.4/
+Download-URL: http://downloads.tryton.org/1.6/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/__tryton__.py b/__tryton__.py
index d4e0a90..0515ee7 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -6,7 +6,7 @@
'name_es_CO': 'Facturación Analítica',
'name_es_ES': 'Facturación analítica',
'name_fr_FR': 'Facturation analytique',
- 'version': '1.4.0',
+ 'version': '1.6.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/invoice.py b/invoice.py
index 86a3fd9..dad3475 100644
--- a/invoice.py
+++ b/invoice.py
@@ -2,6 +2,7 @@
#this repository contains the full copyright notices and license terms.
"Invoice"
from trytond.model import ModelView, ModelSQL, fields
+from trytond.pyson import Not, Equal, Eval
class InvoiceLine(ModelSQL, ModelView):
@@ -10,7 +11,7 @@ class InvoiceLine(ModelSQL, ModelView):
analytic_accounts = fields.Many2One('analytic_account.account.selection',
'Analytic Accounts',
states={
- 'invisible': "type != 'line'",
+ 'invisible': Not(Equal(Eval('type'), 'line')),
})
def _view_look_dom_arch(self, cursor, user, tree, type, context=None):
diff --git a/setup.py b/setup.py
index 98580f0..8e44c05 100644
--- a/setup.py
+++ b/setup.py
@@ -2,19 +2,22 @@
#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 setuptools import setup, find_packages
+from setuptools import setup
import re
-info = eval(file('__tryton__.py').read())
+info = eval(open('__tryton__.py').read())
+major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
+major_version = int(major_version)
+minor_version = int(minor_version)
requires = []
for dep in info.get('depends', []):
if not re.match(r'(ir|res|workflow|webdav)(\W|$)', dep):
- requires.append('trytond_' + dep)
-
-major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
-requires.append('trytond >= %s.%s' % (major_version, minor_version))
-requires.append('trytond < %s.%s' % (major_version, int(minor_version) + 1))
+ requires.append('trytond_%s >= %s.%s, < %s.%s' %
+ (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))
setup(name='trytond_analytic_invoice',
version=info.get('version', '0.0.1'),
@@ -27,6 +30,7 @@ setup(name='trytond_analytic_invoice',
package_dir={'trytond.modules.analytic_invoice': '.'},
packages=[
'trytond.modules.analytic_invoice',
+ 'trytond.modules.analytic_invoice.tests',
],
package_data={
'trytond.modules.analytic_invoice': info.get('xml', []) \
@@ -55,4 +59,6 @@ setup(name='trytond_analytic_invoice',
[trytond.modules]
analytic_invoice = trytond.modules.analytic_invoice
""",
+ test_suite='tests',
+ test_loader='trytond.test_loader:Loader',
)
diff --git a/tests/__init__.py b/tests/__init__.py
index 2f6f571..f977db0 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,4 +1,4 @@
#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 test_analytic_invoice import *
+from test_analytic_invoice import suite
diff --git a/tests/test_analytic_invoice.py b/tests/test_analytic_invoice.py
index 0cdbd2b..bd75423 100644
--- a/tests/test_analytic_invoice.py
+++ b/tests/test_analytic_invoice.py
@@ -10,7 +10,7 @@ if os.path.isdir(DIR):
import unittest
import trytond.tests.test_tryton
-from trytond.tests.test_tryton import RPCProxy, CONTEXT, SOCK, test_view
+from trytond.tests.test_tryton import test_view
class AnalyticInvoiceTestCase(unittest.TestCase):
@@ -28,11 +28,10 @@ class AnalyticInvoiceTestCase(unittest.TestCase):
self.assertRaises(Exception, test_view('analytic_invoice'))
def suite():
- return unittest.TestLoader().loadTestsFromTestCase(AnalyticInvoiceTestCase)
+ suite = trytond.tests.test_tryton.suite()
+ suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
+ AnalyticInvoiceTestCase))
+ return suite
if __name__ == '__main__':
- suiteTrytond = trytond.tests.test_tryton.suite()
- suiteAnalyticInvoice = suite()
- alltests = unittest.TestSuite([suiteTrytond, suiteAnalyticInvoice])
- unittest.TextTestRunner(verbosity=2).run(alltests)
- SOCK.disconnect()
+ unittest.TextTestRunner(verbosity=2).run(suite())
diff --git a/trytond_analytic_invoice.egg-info/PKG-INFO b/trytond_analytic_invoice.egg-info/PKG-INFO
index d32ba69..a69bd24 100644
--- a/trytond_analytic_invoice.egg-info/PKG-INFO
+++ b/trytond_analytic_invoice.egg-info/PKG-INFO
@@ -1,13 +1,13 @@
Metadata-Version: 1.0
Name: trytond-analytic-invoice
-Version: 1.4.0
+Version: 1.6.0
Summary: Add analytic account on invoice lines and generate analytic lines on the moves of invoice.
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.4/
+Download-URL: http://downloads.tryton.org/1.6/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_analytic_invoice.egg-info/SOURCES.txt b/trytond_analytic_invoice.egg-info/SOURCES.txt
index 7929e54..b615c3f 100644
--- a/trytond_analytic_invoice.egg-info/SOURCES.txt
+++ b/trytond_analytic_invoice.egg-info/SOURCES.txt
@@ -13,8 +13,8 @@ setup.py
./__init__.py
./__tryton__.py
./invoice.py
-tests/__init__.py
-tests/test_analytic_invoice.py
+./tests/__init__.py
+./tests/test_analytic_invoice.py
trytond_analytic_invoice.egg-info/PKG-INFO
trytond_analytic_invoice.egg-info/SOURCES.txt
trytond_analytic_invoice.egg-info/dependency_links.txt
diff --git a/trytond_analytic_invoice.egg-info/requires.txt b/trytond_analytic_invoice.egg-info/requires.txt
index 78ff445..475c704 100644
--- a/trytond_analytic_invoice.egg-info/requires.txt
+++ b/trytond_analytic_invoice.egg-info/requires.txt
@@ -1,4 +1,3 @@
-trytond_account_invoice
-trytond_analytic_account
-trytond >= 1.4
-trytond < 1.5
\ No newline at end of file
+trytond_account_invoice >= 1.6, < 1.7
+trytond_analytic_account >= 1.6, < 1.7
+trytond >= 1.6, < 1.7
\ No newline at end of file
commit 4d5011f24ca0d1f17c4ba820e2151b514598c5da
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Oct 19 21:46:07 2009 +0200
Adding upstream version 1.4.0.
diff --git a/CHANGELOG b/CHANGELOG
index d28f483..b4765f1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 1.4.0 - 2009-10-19
+* Bug fixes (see mercurial logs for details)
+
Version 1.2.0 - 2009-04-20
* Bug fixes (see mercurial logs for details)
* Allow egg installation
diff --git a/INSTALL b/INSTALL
index 895fbf8..d9f4210 100644
--- a/INSTALL
+++ b/INSTALL
@@ -5,7 +5,7 @@ Prerequisites
-------------
* Python 2.4 or later (http://www.python.org/)
- * trytond 1.1.x (http://www.tryton.org/)
+ * trytond (http://www.tryton.org/)
* trytond_account_invoice (http://www.tryton.org/)
* trytond_analytic_account (http://www.tryton.org/)
diff --git a/MANIFEST.in b/MANIFEST.in
index 5343ad8..c61b52d 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -7,3 +7,4 @@ include LICENSE
include *.xml
include *.odt
include *.csv
+include tests/*
diff --git a/PKG-INFO b/PKG-INFO
index f98d718..dcf0876 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,13 +1,13 @@
Metadata-Version: 1.0
Name: trytond_analytic_invoice
-Version: 1.2.0
+Version: 1.4.0
Summary: Add analytic account on invoice lines and generate analytic lines on the moves of invoice.
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.2/
+Download-URL: http://downloads.tryton.org/1.4/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/__init__.py b/__init__.py
index 646e21a..d415f1d 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,3 +1,4 @@
-#This file is part of Tryton. The COPYRIGHT file at the top level of this repository contains the full copyright notices and license terms.
+#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 invoice import *
diff --git a/__tryton__.py b/__tryton__.py
index 55c768c..d4e0a90 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -4,9 +4,9 @@
'name': 'Analytic Invoice',
'name_de_DE': 'Kostenstellen Rechnungsstellung',
'name_es_CO': 'Facturación Analítica',
- 'name_es_ES': 'Facturación Analítica',
+ 'name_es_ES': 'Facturación analítica',
'name_fr_FR': 'Facturation analytique',
- 'version': '1.2.0',
+ 'version': '1.4.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
@@ -18,9 +18,8 @@
'description_es_CO': ''' - Adición de contabilidad analítica a las líneas de facturación
- Generación de líneas analíticas en la factura.
''',
- 'description_es_ES': ''' - Adición de contabilidad analítica a las líneas de facturación
- - Generación de líneas analíticas en la factura.
-''',
+ 'description_es_ES': '''Añade una cuenta analítica en las líneas de '''
+ '''factura y genera líneas analíticas en los asientos de la factura.''',
'description_fr_FR': '''Ajoute la comptabilité analytique sur les lignes '''
'''de facture et génère les lignes analytiques sur les mouvements de la '''
'''facture.''',
diff --git a/invoice.py b/invoice.py
index ef9ec77..86a3fd9 100644
--- a/invoice.py
+++ b/invoice.py
@@ -1,4 +1,5 @@
-#This file is part of Tryton. The COPYRIGHT file at the top level of this repository contains the full copyright notices and license terms.
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
"Invoice"
from trytond.model import ModelView, ModelSQL, fields
@@ -192,7 +193,6 @@ class InvoiceLine(ModelSQL, ModelView):
vals['name'] = line.description
vals['debit'] = res['debit']
vals['credit'] = res['credit']
- vals['currency'] = line.invoice.currency.id
vals['account'] = account.id
vals['journal'] = line.invoice.journal.id
vals['date'] = line.invoice.invoice_date
diff --git a/setup.py b/setup.py
index b0e0eec..98580f0 100644
--- a/setup.py
+++ b/setup.py
@@ -9,17 +9,12 @@ info = eval(file('__tryton__.py').read())
requires = []
for dep in info.get('depends', []):
- match = re.compile(
- '(ir|res|workflow|webdav)((\s|$|<|>|<=|>=|==|!=).*?$)').match(dep)
- if match:
- continue
- else:
- dep = 'trytond_' + dep
- requires.append(dep)
+ if not re.match(r'(ir|res|workflow|webdav)(\W|$)', dep):
+ requires.append('trytond_' + dep)
major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
requires.append('trytond >= %s.%s' % (major_version, minor_version))
-requires.append('trytond < %s.%s' % (major_version, str(int(minor_version) + 1)))
+requires.append('trytond < %s.%s' % (major_version, int(minor_version) + 1))
setup(name='trytond_analytic_invoice',
version=info.get('version', '0.0.1'),
diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 0000000..2f6f571
--- /dev/null
+++ b/tests/__init__.py
@@ -0,0 +1,4 @@
+#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 test_analytic_invoice import *
diff --git a/tests/test_analytic_invoice.py b/tests/test_analytic_invoice.py
new file mode 100644
index 0000000..0cdbd2b
--- /dev/null
+++ b/tests/test_analytic_invoice.py
@@ -0,0 +1,38 @@
+#!/usr/bin/env python
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+
+import sys, os
+DIR = os.path.abspath(os.path.normpath(os.path.join(__file__,
+ '..', '..', '..', '..', '..', 'trytond')))
+if os.path.isdir(DIR):
+ sys.path.insert(0, os.path.dirname(DIR))
+
+import unittest
+import trytond.tests.test_tryton
+from trytond.tests.test_tryton import RPCProxy, CONTEXT, SOCK, test_view
+
+
+class AnalyticInvoiceTestCase(unittest.TestCase):
+ '''
+ Test AnalyticInvoice module.
+ '''
+
+ def setUp(self):
+ trytond.tests.test_tryton.install_module('analytic_invoice')
+
+ def test0005views(self):
+ '''
+ Test views.
+ '''
+ self.assertRaises(Exception, test_view('analytic_invoice'))
+
+def suite():
+ return unittest.TestLoader().loadTestsFromTestCase(AnalyticInvoiceTestCase)
+
+if __name__ == '__main__':
+ suiteTrytond = trytond.tests.test_tryton.suite()
+ suiteAnalyticInvoice = suite()
+ alltests = unittest.TestSuite([suiteTrytond, suiteAnalyticInvoice])
+ unittest.TextTestRunner(verbosity=2).run(alltests)
+ SOCK.disconnect()
diff --git a/trytond_analytic_invoice.egg-info/PKG-INFO b/trytond_analytic_invoice.egg-info/PKG-INFO
index 0aa6af9..d32ba69 100644
--- a/trytond_analytic_invoice.egg-info/PKG-INFO
+++ b/trytond_analytic_invoice.egg-info/PKG-INFO
@@ -1,13 +1,13 @@
Metadata-Version: 1.0
Name: trytond-analytic-invoice
-Version: 1.2.0
+Version: 1.4.0
Summary: Add analytic account on invoice lines and generate analytic lines on the moves of invoice.
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.2/
+Download-URL: http://downloads.tryton.org/1.4/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_analytic_invoice.egg-info/SOURCES.txt b/trytond_analytic_invoice.egg-info/SOURCES.txt
index bfe7099..7929e54 100644
--- a/trytond_analytic_invoice.egg-info/SOURCES.txt
+++ b/trytond_analytic_invoice.egg-info/SOURCES.txt
@@ -13,6 +13,8 @@ setup.py
./__init__.py
./__tryton__.py
./invoice.py
+tests/__init__.py
+tests/test_analytic_invoice.py
trytond_analytic_invoice.egg-info/PKG-INFO
trytond_analytic_invoice.egg-info/SOURCES.txt
trytond_analytic_invoice.egg-info/dependency_links.txt
diff --git a/trytond_analytic_invoice.egg-info/requires.txt b/trytond_analytic_invoice.egg-info/requires.txt
index b1fdc3d..78ff445 100644
--- a/trytond_analytic_invoice.egg-info/requires.txt
+++ b/trytond_analytic_invoice.egg-info/requires.txt
@@ -1,4 +1,4 @@
trytond_account_invoice
trytond_analytic_account
-trytond >= 1.2
-trytond < 1.3
\ No newline at end of file
+trytond >= 1.4
+trytond < 1.5
\ No newline at end of file
commit 225baa38dc3032e7510576a7d89478495588a1bc
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Apr 21 11:09:16 2009 +0200
Adding upstream version 1.2.0.
diff --git a/CHANGELOG b/CHANGELOG
index 2521948..d28f483 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,5 @@
-Version 1.0.2 - 2009-03-02
-* Some bug fixes (see mercurial logs for details)
-
-Version 1.0.1 - 2008-12-01
+Version 1.2.0 - 2009-04-20
+* Bug fixes (see mercurial logs for details)
* Allow egg installation
Version 1.0.0 - 2008-11-17
diff --git a/INSTALL b/INSTALL
index a90daf6..895fbf8 100644
--- a/INSTALL
+++ b/INSTALL
@@ -5,14 +5,14 @@ Prerequisites
-------------
* Python 2.4 or later (http://www.python.org/)
- * trytond 0.0.x (http://www.tryton.org/)
+ * trytond 1.1.x (http://www.tryton.org/)
* trytond_account_invoice (http://www.tryton.org/)
* trytond_analytic_account (http://www.tryton.org/)
Installation
------------
-Once you've downloaded and unpacked a trytond_analytic_invoice source release, enter the
+Once you've downloaded and unpacked the trytond_analytic_invoice source release, enter the
directory where the archive was unpacked, and run:
python setup.py install
diff --git a/PKG-INFO b/PKG-INFO
index 5fb568b..f98d718 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,13 +1,13 @@
Metadata-Version: 1.0
Name: trytond_analytic_invoice
-Version: 1.0.2
+Version: 1.2.0
Summary: Add analytic account on invoice lines and generate analytic lines on the moves of invoice.
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.0/
+Download-URL: http://downloads.tryton.org/1.2/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/__tryton__.py b/__tryton__.py
index 874f09a..55c768c 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -3,9 +3,10 @@
{
'name': 'Analytic Invoice',
'name_de_DE': 'Kostenstellen Rechnungsstellung',
- 'name_fr_FR': 'Facturation analytique',
+ 'name_es_CO': 'Facturación Analítica',
'name_es_ES': 'Facturación Analítica',
- 'version': '1.0.2',
+ 'name_fr_FR': 'Facturation analytique',
+ 'version': '1.2.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
@@ -14,6 +15,9 @@
'description_de_DE': ''' - Fügt Kostenstellen zu Rechnungszeilen hinzu
- Erstellt Positionen für Kostenstellen bei Buchung von Rechnungen
''',
+ 'description_es_CO': ''' - Adición de contabilidad analítica a las líneas de facturación
+ - Generación de líneas analíticas en la factura.
+''',
'description_es_ES': ''' - Adición de contabilidad analítica a las líneas de facturación
- Generación de líneas analíticas en la factura.
''',
@@ -30,6 +34,7 @@
],
'translation': [
'de_DE.csv',
+ 'es_CO.csv',
'es_ES.csv',
'fr_FR.csv',
],
diff --git a/es_ES.csv b/es_CO.csv
similarity index 100%
copy from es_ES.csv
copy to es_CO.csv
diff --git a/es_ES.csv b/es_ES.csv
index 0e71661..8750e2e 100644
--- a/es_ES.csv
+++ b/es_ES.csv
@@ -1,2 +1,2 @@
type,name,res_id,src,value,fuzzy
-field,"account.invoice.line,analytic_accounts",0,Analytic Accounts,Cuentas Analíticas,0
+field,"account.invoice.line,analytic_accounts",0,Analytic Accounts,Cuentas analíticas,0
diff --git a/invoice.py b/invoice.py
index db6b6be..ef9ec77 100644
--- a/invoice.py
+++ b/invoice.py
@@ -1,10 +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.
"Invoice"
+from trytond.model import ModelView, ModelSQL, fields
-from trytond.osv import fields, OSV
-
-class InvoiceLine(OSV):
+class InvoiceLine(ModelSQL, ModelView):
_name = 'account.invoice.line'
analytic_accounts = fields.Many2One('analytic_account.account.selection',
@@ -34,15 +33,30 @@ class InvoiceLine(OSV):
user, analytic_accounts_field, fields_names, context=context))
return res
- def _read_flat(self, cursor, user, ids, fields_names, context=None,
- load='_classic_read'):
+ def read(self, cursor, user, ids, fields_names=None, context=None):
selection_obj = self.pool.get('analytic_account.account.selection')
- res = super(InvoiceLine, self)._read_flat(cursor, user, ids,
- fields_names, context=context, load=load)
+
+ int_id = False
+ if isinstance(ids, (int, long)):
+ int_id = True
+ ids = [ids]
+
+ if fields_names:
+ fields_names2 = [x for x in fields_names
+ if not x.startswith('analytic_account_')]
+ else:
+ fields_names2 = fields_names
+
+ res = super(InvoiceLine, self).read(cursor, user, ids,
+ fields_names=fields_names2, context=context)
+
+ if not fields_names:
+ fields_names = list(set(self._columns.keys() \
+ + self._inherit_fields.keys()))
root_ids = []
for field in fields_names:
- if field.startswith('analytic_account_'):
+ if field.startswith('analytic_account_') and '.' not in field:
root_ids.append(int(field[len('analytic_account_'):]))
if root_ids:
id2record = {}
@@ -52,10 +66,19 @@ class InvoiceLine(OSV):
for line in lines:
if line.type != 'line':
continue
+ if not line.analytic_accounts:
+ continue
for account in line.analytic_accounts.accounts:
if account.root.id in root_ids:
id2record[line.id]['analytic_account_' \
+ str(account.root.id)] = account.id
+ for field in fields_names:
+ if field.startswith('analytic_account_' + \
+ str(account.root.id) + '.'):
+ ham, field2 = field.split('.', 1)
+ id2record[line.id][field] = account[field2]
+ if int_id:
+ return res[0]
return res
def create(self, cursor, user, vals, context=None):
@@ -95,6 +118,14 @@ class InvoiceLine(OSV):
if line.type != 'line':
continue
accounts = []
+ if not line.analytic_accounts:
+ # Create missing selection
+ selection_id = selection_obj.create(cursor, 0, {},
+ context=context)
+ self.write(cursor, user, line.id, {
+ 'analytic_accounts': selection_id,
+ }, context=context)
+ line = self.browse(cursor, user, line.id, context=context)
for account in line.analytic_accounts.accounts:
if account.root.id in selection_vals:
value = selection_vals[account.root.id]
@@ -128,21 +159,29 @@ class InvoiceLine(OSV):
selection_obj.delete(cursor, user, selection_ids, context=context)
return res
- def copy(self, cursor, user, line_id, default=None, context=None):
+ def copy(self, cursor, user, ids, default=None, context=None):
selection_obj = self.pool.get('analytic_account.account.selection')
- if default is None:
- default = {}
- default = default.copy()
- line = self.browse(cursor, user, line_id, context=context)
- selection_id = False
- if line.analytic_accounts:
- selection_id = selection_obj.copy(cursor, user,
- line.analytic_accounts.id, context=context)
- default['analytic_accounts'] = selection_id
- return super(InvoiceLine, self).copy(cursor, user, line_id,
+ new_ids = super(InvoiceLine, self).copy(cursor, user, ids,
default=default, context=context)
+ int_id = False
+ if isinstance(new_ids, (int, long)):
+ int_id = True
+ new_ids = [new_ids]
+
+ for line in self.browse(cursor, user, new_ids, context=context):
+ if line.analytic_accounts:
+ selection_id = selection_obj.copy(cursor, user,
+ line.analytic_accounts.id, context=context)
+ self.write(cursor, user, line.id, {
+ 'analytic_accounts': selection_id,
+ }, context=context)
+
+ if int_id:
+ return new_ids[0]
+ return new_ids
+
def get_move_line(self, cursor, user, line, context=None):
res = super(InvoiceLine, self).get_move_line(cursor, user, line,
context=context)
@@ -165,7 +204,7 @@ class InvoiceLine(OSV):
InvoiceLine()
-class Account(OSV):
+class Account(ModelSQL, ModelView):
_name = 'analytic_account.account'
def delete(self, cursor, user, ids, context=None):
diff --git a/invoice.xml b/invoice.xml
index bb0a738..2a476ca 100644
--- a/invoice.xml
+++ b/invoice.xml
@@ -1,5 +1,6 @@
<?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. -->
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
<tryton>
<data>
<record model="ir.ui.view" id="invoice_line_view_form">
@@ -9,7 +10,7 @@
<![CDATA[
<data>
<xpath
- expr="/form/separator[@name="taxes"]"
+ expr="/form/notebook/page/separator[@name="taxes"]"
position="before">
<group col="4" colspan="4" name="analytic_accounts">
<field name="analytic_accounts"/>
diff --git a/trytond_analytic_invoice.egg-info/PKG-INFO b/trytond_analytic_invoice.egg-info/PKG-INFO
index 18e5cbd..0aa6af9 100644
--- a/trytond_analytic_invoice.egg-info/PKG-INFO
+++ b/trytond_analytic_invoice.egg-info/PKG-INFO
@@ -1,13 +1,13 @@
Metadata-Version: 1.0
Name: trytond-analytic-invoice
-Version: 1.0.2
+Version: 1.2.0
Summary: Add analytic account on invoice lines and generate analytic lines on the moves of invoice.
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.0/
+Download-URL: http://downloads.tryton.org/1.2/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_analytic_invoice.egg-info/SOURCES.txt b/trytond_analytic_invoice.egg-info/SOURCES.txt
index 02fde67..bfe7099 100644
--- a/trytond_analytic_invoice.egg-info/SOURCES.txt
+++ b/trytond_analytic_invoice.egg-info/SOURCES.txt
@@ -5,6 +5,7 @@ LICENSE
MANIFEST.in
README
de_DE.csv
+es_CO.csv
es_ES.csv
fr_FR.csv
invoice.xml
diff --git a/trytond_analytic_invoice.egg-info/requires.txt b/trytond_analytic_invoice.egg-info/requires.txt
index 462f165..b1fdc3d 100644
--- a/trytond_analytic_invoice.egg-info/requires.txt
+++ b/trytond_analytic_invoice.egg-info/requires.txt
@@ -1,4 +1,4 @@
trytond_account_invoice
trytond_analytic_account
-trytond >= 1.0
-trytond < 1.1
\ No newline at end of file
+trytond >= 1.2
+trytond < 1.3
\ No newline at end of file
commit cce8f1b75e13b7bf6d33771364c01dcc096b9d36
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Mar 23 06:45:30 2009 +0100
Adding upstream version 1.0.2.
diff --git a/CHANGELOG b/CHANGELOG
index 9801fce..2521948 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 1.0.2 - 2009-03-02
+* Some bug fixes (see mercurial logs for details)
+
Version 1.0.1 - 2008-12-01
* Allow egg installation
diff --git a/COPYRIGHT b/COPYRIGHT
index 2afd2a7..853f1f7 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2008 Cédric Krier.
-Copyright (C) 2008 B2CK SPRL.
+Copyright (C) 2008-2009 Cédric Krier.
+Copyright (C) 2008-2009 B2CK SPRL.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/PKG-INFO b/PKG-INFO
index cdae81b..5fb568b 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_analytic_invoice
-Version: 1.0.1
+Version: 1.0.2
Summary: Add analytic account on invoice lines and generate analytic lines on the moves of invoice.
Home-page: http://www.tryton.org/
diff --git a/__tryton__.py b/__tryton__.py
index afd2c20..874f09a 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -5,7 +5,7 @@
'name_de_DE': 'Kostenstellen Rechnungsstellung',
'name_fr_FR': 'Facturation analytique',
'name_es_ES': 'Facturación Analítica',
- 'version': '1.0.1',
+ 'version': '1.0.2',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/invoice.py b/invoice.py
index 67ad867..db6b6be 100644
--- a/invoice.py
+++ b/invoice.py
@@ -50,6 +50,8 @@ class InvoiceLine(OSV):
id2record[record['id']] = record
lines = self.browse(cursor, user, ids, context=context)
for line in lines:
+ if line.type != 'line':
+ continue
for account in line.analytic_accounts.accounts:
if account.root.id in root_ids:
id2record[line.id]['analytic_account_' \
diff --git a/trytond_analytic_invoice.egg-info/PKG-INFO b/trytond_analytic_invoice.egg-info/PKG-INFO
index d422688..18e5cbd 100644
--- a/trytond_analytic_invoice.egg-info/PKG-INFO
+++ b/trytond_analytic_invoice.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-analytic-invoice
-Version: 1.0.1
+Version: 1.0.2
Summary: Add analytic account on invoice lines and generate analytic lines on the moves of invoice.
Home-page: http://www.tryton.org/
commit f946f3e468701f941d4c59fac0a29e87e958c1fa
Author: Daniel Baumann <daniel at debian.org>
Date: Wed Jan 28 14:03:11 2009 +0100
Adding upstream version 1.0.1.
diff --git a/CHANGELOG b/CHANGELOG
index eacaaef..9801fce 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,2 +1,5 @@
+Version 1.0.1 - 2008-12-01
+* Allow egg installation
+
Version 1.0.0 - 2008-11-17
* Initial release
diff --git a/PKG-INFO b/PKG-INFO
index ad3fab3..cdae81b 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,13 @@
Metadata-Version: 1.0
Name: trytond_analytic_invoice
-Version: 1.0.0
+Version: 1.0.1
Summary: Add analytic account on invoice lines and generate analytic lines on the moves of invoice.
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
+Download-URL: http://downloads.tryton.org/1.0/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/__tryton__.py b/__tryton__.py
index 9c71493..afd2c20 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -5,7 +5,7 @@
'name_de_DE': 'Kostenstellen Rechnungsstellung',
'name_fr_FR': 'Facturation analytique',
'name_es_ES': 'Facturación Analítica',
- 'version': '1.0.0',
+ 'version': '1.0.1',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/setup.py b/setup.py
index b353051..b0e0eec 100644
--- a/setup.py
+++ b/setup.py
@@ -27,6 +27,8 @@ setup(name='trytond_analytic_invoice',
author=info.get('author', ''),
author_email=info.get('email', ''),
url=info.get('website', ''),
+ download_url="http://downloads.tryton.org/" + \
+ info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
package_dir={'trytond.modules.analytic_invoice': '.'},
packages=[
'trytond.modules.analytic_invoice',
@@ -53,4 +55,9 @@ setup(name='trytond_analytic_invoice',
],
license='GPL-3',
install_requires=requires,
+ zip_safe=False,
+ entry_points="""
+ [trytond.modules]
+ analytic_invoice = trytond.modules.analytic_invoice
+ """,
)
diff --git a/trytond_analytic_invoice.egg-info/PKG-INFO b/trytond_analytic_invoice.egg-info/PKG-INFO
index 23b3524..d422688 100644
--- a/trytond_analytic_invoice.egg-info/PKG-INFO
+++ b/trytond_analytic_invoice.egg-info/PKG-INFO
@@ -1,12 +1,13 @@
Metadata-Version: 1.0
Name: trytond-analytic-invoice
-Version: 1.0.0
+Version: 1.0.1
Summary: Add analytic account on invoice lines and generate analytic lines on the moves of invoice.
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
+Download-URL: http://downloads.tryton.org/1.0/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_analytic_invoice.egg-info/SOURCES.txt b/trytond_analytic_invoice.egg-info/SOURCES.txt
index 71bd9db..02fde67 100644
--- a/trytond_analytic_invoice.egg-info/SOURCES.txt
+++ b/trytond_analytic_invoice.egg-info/SOURCES.txt
@@ -15,5 +15,7 @@ setup.py
trytond_analytic_invoice.egg-info/PKG-INFO
trytond_analytic_invoice.egg-info/SOURCES.txt
trytond_analytic_invoice.egg-info/dependency_links.txt
+trytond_analytic_invoice.egg-info/entry_points.txt
+trytond_analytic_invoice.egg-info/not-zip-safe
trytond_analytic_invoice.egg-info/requires.txt
trytond_analytic_invoice.egg-info/top_level.txt
\ No newline at end of file
diff --git a/trytond_analytic_invoice.egg-info/entry_points.txt b/trytond_analytic_invoice.egg-info/entry_points.txt
new file mode 100644
index 0000000..f92f1a3
--- /dev/null
+++ b/trytond_analytic_invoice.egg-info/entry_points.txt
@@ -0,0 +1,4 @@
+
+ [trytond.modules]
+ analytic_invoice = trytond.modules.analytic_invoice
+
\ No newline at end of file
diff --git a/trytond_analytic_invoice.egg-info/not-zip-safe b/trytond_analytic_invoice.egg-info/not-zip-safe
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/trytond_analytic_invoice.egg-info/not-zip-safe
@@ -0,0 +1 @@
+
commit 68c9aa601930329f80bfaef8dd3b01ad423608a6
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Nov 18 13:05:54 2008 +0100
Adding upstream version 1.0.0.
diff --git a/CHANGELOG b/CHANGELOG
new file mode 100644
index 0000000..eacaaef
--- /dev/null
+++ b/CHANGELOG
@@ -0,0 +1,2 @@
+Version 1.0.0 - 2008-11-17
+* Initial release
diff --git a/COPYRIGHT b/COPYRIGHT
new file mode 100644
index 0000000..2afd2a7
--- /dev/null
+++ b/COPYRIGHT
@@ -0,0 +1,15 @@
+Copyright (C) 2008 Cédric Krier.
+Copyright (C) 2008 B2CK SPRL.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/INSTALL b/INSTALL
new file mode 100644
index 0000000..a90daf6
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,31 @@
+Installing trytond_analytic_invoice
+===================================
+
+Prerequisites
+-------------
+
+ * Python 2.4 or later (http://www.python.org/)
+ * trytond 0.0.x (http://www.tryton.org/)
+ * trytond_account_invoice (http://www.tryton.org/)
+ * trytond_analytic_account (http://www.tryton.org/)
+
+Installation
+------------
+
+Once you've downloaded and unpacked a trytond_analytic_invoice source release, enter the
+directory where the archive was unpacked, and run:
+
+ python setup.py install
+
+Note that you may need administrator/root privileges for this step, as
+this command will by default attempt to install module to the Python
+site-packages directory on your system.
+
+For advanced options, please refer to the easy_install and/or the distutils
+documentation:
+
+ http://peak.telecommunity.com/DevCenter/EasyInstall
+ http://docs.python.org/inst/inst.html
+
+To use without installation, extract the archive into ``trytond/modules`` with
+the directory name analytic_invoice.
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..94a9ed0
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ <program> Copyright (C) <year> <name of author>
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..5343ad8
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,9 @@
+include INSTALL
+include README
+include TODO
+include COPYRIGHT
+include CHANGELOG
+include LICENSE
+include *.xml
+include *.odt
+include *.csv
diff --git a/PKG-INFO b/PKG-INFO
new file mode 100644
index 0000000..ad3fab3
--- /dev/null
+++ b/PKG-INFO
@@ -0,0 +1,25 @@
+Metadata-Version: 1.0
+Name: trytond_analytic_invoice
+Version: 1.0.0
+Summary: Add analytic account on invoice lines and generate analytic lines on the moves of invoice.
+
+Home-page: http://www.tryton.org/
+Author: B2CK
+Author-email: info at b2ck.com
+License: GPL-3
+Description: UNKNOWN
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Plugins
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Financial and Insurance Industry
+Classifier: Intended Audience :: Legal Industry
+Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Natural Language :: English
+Classifier: Natural Language :: French
+Classifier: Natural Language :: German
+Classifier: Natural Language :: Spanish
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Topic :: Office/Business
+Classifier: Topic :: Office/Business :: Financial :: Accounting
diff --git a/README b/README
new file mode 100644
index 0000000..27ef5eb
--- /dev/null
+++ b/README
@@ -0,0 +1,36 @@
+trytond_analytic_invoice
+========================
+
+The analytic_invoice module of the Tryton application platform.
+See __tryton__.py
+
+Installing
+----------
+
+See INSTALL
+
+Support
+-------
+
+If you encounter any problems with Tryton, please don't hesitate to ask
+questions on the Tryton bug tracker, mailing list, wiki or IRC channel:
+
+ http://bugs.tryton.org/
+ http://groups.tryton.org/
+ http://wiki.tryton.org/
+ irc://irc.freenode.net/tryton
+
+License
+-------
+
+See LICENSE
+
+Copyright
+---------
+
+See COPYRIGHT
+
+
+For more information please visit the Tryton web site:
+
+ http://www.tryton.org/
diff --git a/__init__.py b/__init__.py
new file mode 100644
index 0000000..646e21a
--- /dev/null
+++ b/__init__.py
@@ -0,0 +1,3 @@
+#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 invoice import *
diff --git a/__tryton__.py b/__tryton__.py
new file mode 100644
index 0000000..9c71493
--- /dev/null
+++ b/__tryton__.py
@@ -0,0 +1,36 @@
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+{
+ 'name': 'Analytic Invoice',
+ 'name_de_DE': 'Kostenstellen Rechnungsstellung',
+ 'name_fr_FR': 'Facturation analytique',
+ 'name_es_ES': 'Facturación Analítica',
+ 'version': '1.0.0',
+ 'author': 'B2CK',
+ 'email': 'info at b2ck.com',
+ 'website': 'http://www.tryton.org/',
+ 'description': '''Add analytic account on invoice lines and generate analytic lines on the moves of invoice.
+''',
+ 'description_de_DE': ''' - Fügt Kostenstellen zu Rechnungszeilen hinzu
+ - Erstellt Positionen für Kostenstellen bei Buchung von Rechnungen
+''',
+ 'description_es_ES': ''' - Adición de contabilidad analítica a las líneas de facturación
+ - Generación de líneas analíticas en la factura.
+''',
+ 'description_fr_FR': '''Ajoute la comptabilité analytique sur les lignes '''
+ '''de facture et génère les lignes analytiques sur les mouvements de la '''
+ '''facture.''',
+
+ 'depends': [
+ 'account_invoice',
+ 'analytic_account',
+ ],
+ 'xml': [
+ 'invoice.xml',
+ ],
+ 'translation': [
+ 'de_DE.csv',
+ 'es_ES.csv',
+ 'fr_FR.csv',
+ ],
+}
diff --git a/de_DE.csv b/de_DE.csv
new file mode 100644
index 0000000..3de2537
--- /dev/null
+++ b/de_DE.csv
@@ -0,0 +1,2 @@
+type,name,res_id,src,value,fuzzy
+field,"account.invoice.line,analytic_accounts",0,Analytic Accounts,Kostenstellen,0
diff --git a/es_ES.csv b/es_ES.csv
new file mode 100644
index 0000000..0e71661
--- /dev/null
+++ b/es_ES.csv
@@ -0,0 +1,2 @@
+type,name,res_id,src,value,fuzzy
+field,"account.invoice.line,analytic_accounts",0,Analytic Accounts,Cuentas Analíticas,0
diff --git a/fr_FR.csv b/fr_FR.csv
new file mode 100644
index 0000000..a64dce4
--- /dev/null
+++ b/fr_FR.csv
@@ -0,0 +1,2 @@
+type,name,res_id,src,value,fuzzy
+field,"account.invoice.line,analytic_accounts",0,Analytic Accounts,Comptes analytiques,0
diff --git a/invoice.py b/invoice.py
new file mode 100644
index 0000000..67ad867
--- /dev/null
+++ b/invoice.py
@@ -0,0 +1,191 @@
+#This file is part of Tryton. The COPYRIGHT file at the top level of this repository contains the full copyright notices and license terms.
+"Invoice"
+
+from trytond.osv import fields, OSV
+
+
+class InvoiceLine(OSV):
+ _name = 'account.invoice.line'
+
+ analytic_accounts = fields.Many2One('analytic_account.account.selection',
+ 'Analytic Accounts',
+ states={
+ 'invisible': "type != 'line'",
+ })
+
+ def _view_look_dom_arch(self, cursor, user, tree, type, context=None):
+ analytic_account_obj = self.pool.get('analytic_account.account')
+ analytic_account_obj.convert_view(cursor, user, tree, context=context)
+ arch, fields = super(InvoiceLine, self)._view_look_dom_arch(cursor,
+ user, tree, type, context=context)
+ return arch, fields
+
+ def fields_get(self, cursor, user, fields_names=None, context=None):
+ analytic_account_obj = self.pool.get('analytic_account.account')
+
+ res = super(InvoiceLine, self).fields_get(cursor, user, fields_names,
+ context=context)
+
+ analytic_accounts_field = super(InvoiceLine, self).fields_get(cursor,
+ user, ['analytic_accounts'],
+ context=context)['analytic_accounts']
+
+ res.update(analytic_account_obj.analytic_accounts_fields_get(cursor,
+ user, analytic_accounts_field, fields_names, context=context))
+ return res
+
+ def _read_flat(self, cursor, user, ids, fields_names, context=None,
+ load='_classic_read'):
+ selection_obj = self.pool.get('analytic_account.account.selection')
+ res = super(InvoiceLine, self)._read_flat(cursor, user, ids,
+ fields_names, context=context, load=load)
+
+ root_ids = []
+ for field in fields_names:
+ if field.startswith('analytic_account_'):
+ root_ids.append(int(field[len('analytic_account_'):]))
+ if root_ids:
+ id2record = {}
+ for record in res:
+ id2record[record['id']] = record
+ lines = self.browse(cursor, user, ids, context=context)
+ for line in lines:
+ for account in line.analytic_accounts.accounts:
+ if account.root.id in root_ids:
+ id2record[line.id]['analytic_account_' \
+ + str(account.root.id)] = account.id
+ return res
+
+ def create(self, cursor, user, vals, context=None):
+ selection_obj = self.pool.get('analytic_account.account.selection')
+ vals = vals.copy()
+ selection_vals = {}
+ for field in vals.keys():
+ if field.startswith('analytic_account_'):
+ if vals[field]:
+ selection_vals.setdefault('accounts', [])
+ selection_vals['accounts'].append(('add', vals[field]))
+ del vals[field]
+ if vals.get('analytic_accounts'):
+ selection_obj.write(cursor, user, vals['analytic_accounts'],
+ selection_vals, context=context)
+ elif vals.get('type', 'line') == 'line':
+ selection_id = selection_obj.create(cursor, user, selection_vals,
+ context=context)
+ vals['analytic_accounts'] = selection_id
+ return super(InvoiceLine, self).create(cursor, user, vals,
+ context=context)
+
+ def write(self, cursor, user, ids, vals, context=None):
+ selection_obj = self.pool.get('analytic_account.account.selection')
+ vals = vals.copy()
+ if isinstance(ids, (int, long)):
+ ids = [ids]
+ selection_vals = {}
+ for field in vals.keys():
+ if field.startswith('analytic_account_'):
+ root_id = int(field[len('analytic_account_'):])
+ selection_vals[root_id] = vals[field]
+ del vals[field]
+ if selection_vals:
+ lines = self.browse(cursor, user, ids, context=context)
+ for line in lines:
+ if line.type != 'line':
+ continue
+ accounts = []
+ for account in line.analytic_accounts.accounts:
+ if account.root.id in selection_vals:
+ value = selection_vals[account.root.id]
+ if value:
+ accounts.append(value)
+ else:
+ accounts.append(account.id)
+ for account_id in selection_vals.values():
+ if account_id \
+ and account_id not in accounts:
+ accounts.append(account_id)
+ selection_obj.write(cursor, user, line.analytic_accounts.id, {
+ 'accounts': [('set', accounts)],
+ }, context=context)
+ return super(InvoiceLine, self).write(cursor, user, ids, vals,
+ context=context)
+
+ def delete(self, cursor, user, ids, context=None):
+ selection_obj = self.pool.get('analytic_account.account.selection')
+
+ if isinstance(ids, (int, long)):
+ ids = [ids]
+ selection_ids = []
+ lines = self.browse(cursor, user, ids, context=context)
+ for line in lines:
+ if line.analytic_accounts:
+ selection_ids.append(line.analytic_accounts.id)
+
+ res = super(InvoiceLine, self).delete(cursor, user, ids,
+ context=context)
+ selection_obj.delete(cursor, user, selection_ids, context=context)
+ return res
+
+ def copy(self, cursor, user, line_id, default=None, context=None):
+ selection_obj = self.pool.get('analytic_account.account.selection')
+
+ if default is None:
+ default = {}
+ default = default.copy()
+ line = self.browse(cursor, user, line_id, context=context)
+ selection_id = False
+ if line.analytic_accounts:
+ selection_id = selection_obj.copy(cursor, user,
+ line.analytic_accounts.id, context=context)
+ default['analytic_accounts'] = selection_id
+ return super(InvoiceLine, self).copy(cursor, user, line_id,
+ default=default, context=context)
+
+ def get_move_line(self, cursor, user, line, context=None):
+ res = super(InvoiceLine, self).get_move_line(cursor, user, line,
+ context=context)
+ if line.analytic_accounts and line.analytic_accounts.accounts:
+ res['analytic_lines'] = []
+ for account in line.analytic_accounts.accounts:
+ vals = {}
+ vals['name'] = line.description
+ vals['debit'] = res['debit']
+ vals['credit'] = res['credit']
+ vals['currency'] = line.invoice.currency.id
+ vals['account'] = account.id
+ vals['journal'] = line.invoice.journal.id
+ vals['date'] = line.invoice.invoice_date
+ vals['reference'] = line.invoice.reference
+ vals['party'] = line.invoice.party.id
+ res['analytic_lines'].append(('create', vals))
+ return res
+
+InvoiceLine()
+
+
+class Account(OSV):
+ _name = 'analytic_account.account'
+
+ def delete(self, cursor, user, ids, context=None):
+ account_invoice_line_obj = self.pool.get('account.invoice.line')
+ res = super(Account, self).delete(cursor, user, ids, context=context)
+ # Restart the cache on the fields_view_get method of account.invoice.line
+ account_invoice_line_obj.fields_view_get(cursor.dbname)
+ return res
+
+ def create(self, cursor, user, vals, context=None):
+ account_invoice_line_obj = self.pool.get('account.invoice.line')
+ res = super(Account, self).create(cursor, user, vals, context=context)
+ # Restart the cache on the fields_view_get method of account.invoice.line
+ account_invoice_line_obj.fields_view_get(cursor.dbname)
+ return res
+
+ def write(self, cursor, user, ids, vals, context=None):
+ account_invoice_line_obj = self.pool.get('account.invoice.line')
+ res = super(Account, self).write(cursor, user, ids, vals,
+ context=context)
+ # Restart the cache on the fields_view_get method of account.invoice.line
+ account_invoice_line_obj.fields_view_get(cursor.dbname)
+ return res
+
+Account()
diff --git a/invoice.xml b/invoice.xml
new file mode 100644
index 0000000..bb0a738
--- /dev/null
+++ b/invoice.xml
@@ -0,0 +1,23 @@
+<?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. -->
+<tryton>
+ <data>
+ <record model="ir.ui.view" id="invoice_line_view_form">
+ <field name="model">account.invoice.line</field>
+ <field name="inherit" ref="account_invoice.invoice_line_view_form"/>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <data>
+ <xpath
+ expr="/form/separator[@name="taxes"]"
+ position="before">
+ <group col="4" colspan="4" name="analytic_accounts">
+ <field name="analytic_accounts"/>
+ </group>
+ </xpath>
+ </data>
+ ]]>
+ </field>
+ </record>
+ </data>
+</tryton>
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..861a9f5
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,5 @@
+[egg_info]
+tag_build =
+tag_date = 0
+tag_svn_revision = 0
+
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..b353051
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,56 @@
+#!/usr/bin/env python
+#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 setuptools import setup, find_packages
+import re
+
+info = eval(file('__tryton__.py').read())
+
+requires = []
+for dep in info.get('depends', []):
+ match = re.compile(
+ '(ir|res|workflow|webdav)((\s|$|<|>|<=|>=|==|!=).*?$)').match(dep)
+ if match:
+ continue
+ else:
+ dep = 'trytond_' + dep
+ requires.append(dep)
+
+major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
+requires.append('trytond >= %s.%s' % (major_version, minor_version))
+requires.append('trytond < %s.%s' % (major_version, str(int(minor_version) + 1)))
+
+setup(name='trytond_analytic_invoice',
+ version=info.get('version', '0.0.1'),
+ description=info.get('description', ''),
+ author=info.get('author', ''),
+ author_email=info.get('email', ''),
+ url=info.get('website', ''),
+ package_dir={'trytond.modules.analytic_invoice': '.'},
+ packages=[
+ 'trytond.modules.analytic_invoice',
+ ],
+ package_data={
+ 'trytond.modules.analytic_invoice': info.get('xml', []) \
+ + info.get('translation', []),
+ },
+ classifiers=[
+ 'Development Status :: 5 - Production/Stable',
+ 'Environment :: Plugins',
+ 'Intended Audience :: Developers',
+ 'Intended Audience :: Financial and Insurance Industry',
+ 'Intended Audience :: Legal Industry',
+ 'License :: OSI Approved :: GNU General Public License (GPL)',
+ 'Natural Language :: English',
+ 'Natural Language :: French',
+ 'Natural Language :: German',
+ 'Natural Language :: Spanish',
+ 'Operating System :: OS Independent',
+ 'Programming Language :: Python',
+ 'Topic :: Office/Business',
+ 'Topic :: Office/Business :: Financial :: Accounting',
+ ],
+ license='GPL-3',
+ install_requires=requires,
+)
diff --git a/trytond_analytic_invoice.egg-info/PKG-INFO b/trytond_analytic_invoice.egg-info/PKG-INFO
new file mode 100644
index 0000000..23b3524
--- /dev/null
+++ b/trytond_analytic_invoice.egg-info/PKG-INFO
@@ -0,0 +1,25 @@
+Metadata-Version: 1.0
+Name: trytond-analytic-invoice
+Version: 1.0.0
+Summary: Add analytic account on invoice lines and generate analytic lines on the moves of invoice.
+
+Home-page: http://www.tryton.org/
+Author: B2CK
+Author-email: info at b2ck.com
+License: GPL-3
+Description: UNKNOWN
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Plugins
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Financial and Insurance Industry
+Classifier: Intended Audience :: Legal Industry
+Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Natural Language :: English
+Classifier: Natural Language :: French
+Classifier: Natural Language :: German
+Classifier: Natural Language :: Spanish
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Topic :: Office/Business
+Classifier: Topic :: Office/Business :: Financial :: Accounting
diff --git a/trytond_analytic_invoice.egg-info/SOURCES.txt b/trytond_analytic_invoice.egg-info/SOURCES.txt
new file mode 100644
index 0000000..71bd9db
--- /dev/null
+++ b/trytond_analytic_invoice.egg-info/SOURCES.txt
@@ -0,0 +1,19 @@
+CHANGELOG
+COPYRIGHT
+INSTALL
+LICENSE
+MANIFEST.in
+README
+de_DE.csv
+es_ES.csv
+fr_FR.csv
+invoice.xml
+setup.py
+./__init__.py
+./__tryton__.py
+./invoice.py
+trytond_analytic_invoice.egg-info/PKG-INFO
+trytond_analytic_invoice.egg-info/SOURCES.txt
+trytond_analytic_invoice.egg-info/dependency_links.txt
+trytond_analytic_invoice.egg-info/requires.txt
+trytond_analytic_invoice.egg-info/top_level.txt
\ No newline at end of file
diff --git a/trytond_analytic_invoice.egg-info/dependency_links.txt b/trytond_analytic_invoice.egg-info/dependency_links.txt
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/trytond_analytic_invoice.egg-info/dependency_links.txt
@@ -0,0 +1 @@
+
diff --git a/trytond_analytic_invoice.egg-info/requires.txt b/trytond_analytic_invoice.egg-info/requires.txt
new file mode 100644
index 0000000..462f165
--- /dev/null
+++ b/trytond_analytic_invoice.egg-info/requires.txt
@@ -0,0 +1,4 @@
+trytond_account_invoice
+trytond_analytic_account
+trytond >= 1.0
+trytond < 1.1
\ No newline at end of file
diff --git a/trytond_analytic_invoice.egg-info/top_level.txt b/trytond_analytic_invoice.egg-info/top_level.txt
new file mode 100644
index 0000000..93df119
--- /dev/null
+++ b/trytond_analytic_invoice.egg-info/top_level.txt
@@ -0,0 +1 @@
+trytond
--
tryton-modules-analytic-invoice
More information about the tryton-debian-vcs
mailing list