[tryton-debian-vcs] tryton-modules-account-invoice-stock branch upstream updated. upstream/3.4.1-1-g3fed6b4
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Apr 23 16:01:50 UTC 2015
The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account-invoice-stock.git;a=commitdiff;h=upstream/3.4.1-1-g3fed6b4
commit 3fed6b4f9c1c190256623f176d4b1357f21e5320
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Apr 23 16:59:50 2015 +0200
Adding upstream version 3.6.0.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index bc704d6..24733d1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,6 @@
-Version 3.4.1 - 2015-03-01
+Version 3.6.0 - 2015-04-20
* Bug fixes (see mercurial logs for details)
-
+* Add support for PyPy
Version 3.4.0 - 2014-10-20
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index f701e67..2bc7134 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_account_invoice_stock
-Version: 3.4.1
+Version: 3.6.0
Summary: Tryton module to link stock and invoice
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.4/
+Download-URL: http://downloads.tryton.org/3.6/
Description: trytond_account_invoice_stock
=============================
@@ -64,5 +64,7 @@ Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
Classifier: Topic :: Office/Business
Classifier: Topic :: Office/Business :: Financial :: Accounting
diff --git a/__init__.py b/__init__.py
index 876e7fc..60851af 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,5 +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.
from trytond.pool import Pool
from .account import *
diff --git a/account.py b/account.py
index e53c366..60d853d 100644
--- a/account.py
+++ b/account.py
@@ -1,7 +1,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.
+# 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.model import ModelSQL, fields
from trytond.pool import Pool, PoolMeta
+from trytond.pyson import Eval
__all__ = ['InvoiceLineStockMove', 'InvoiceLine']
@@ -21,7 +22,11 @@ class InvoiceLineStockMove(ModelSQL):
class InvoiceLine:
__name__ = 'account.invoice.line'
stock_moves = fields.Many2Many('account.invoice.line-stock.move',
- 'invoice_line', 'stock_move', 'Stock Moves')
+ 'invoice_line', 'stock_move', 'Stock Moves',
+ states={
+ 'invisible': Eval('type') != 'line',
+ },
+ depends=['type'])
@property
def moved_quantity(self):
diff --git a/setup.py b/setup.py
index 0fe4148..8379fd1 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
#!/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.
+# 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
import re
@@ -85,6 +85,8 @@ setup(name=name,
'Natural Language :: Spanish',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2.7',
+ 'Programming Language :: Python :: Implementation :: CPython',
+ 'Programming Language :: Python :: Implementation :: PyPy',
'Topic :: Office/Business',
'Topic :: Office/Business :: Financial :: Accounting',
],
diff --git a/stock.py b/stock.py
index 93294cd..1e41bda 100644
--- a/stock.py
+++ b/stock.py
@@ -1,5 +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.
from trytond.model import fields
from trytond.pool import Pool, PoolMeta
diff --git a/tests/__init__.py b/tests/__init__.py
index 55c935c..2cb9193 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,5 +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.
from .test_account_invoice_stock import suite
diff --git a/tests/test_account_invoice_stock.py b/tests/test_account_invoice_stock.py
index dc899c2..1258493 100644
--- a/tests/test_account_invoice_stock.py
+++ b/tests/test_account_invoice_stock.py
@@ -1,23 +1,13 @@
-#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.
import unittest
import trytond.tests.test_tryton
-from trytond.tests.test_tryton import test_view, test_depends
+from trytond.tests.test_tryton import ModuleTestCase
-class AccountInvoiceStockTestCase(unittest.TestCase):
+class AccountInvoiceStockTestCase(ModuleTestCase):
'Test AccountInvoiceStock module'
-
- def setUp(self):
- trytond.tests.test_tryton.install_module('account_invoice_stock')
-
- def test0005views(self):
- 'Test views'
- test_view('account_invoice_stock')
-
- def test0006depends(self):
- 'Test depends'
- test_depends()
+ module = 'account_invoice_stock'
def suite():
diff --git a/tryton.cfg b/tryton.cfg
index 6d285a8..06e7480 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.4.1
+version=3.6.0
depends:
account_invoice
stock
diff --git a/trytond_account_invoice_stock.egg-info/PKG-INFO b/trytond_account_invoice_stock.egg-info/PKG-INFO
index a6893ed..582a51b 100644
--- a/trytond_account_invoice_stock.egg-info/PKG-INFO
+++ b/trytond_account_invoice_stock.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-account-invoice-stock
-Version: 3.4.1
+Version: 3.6.0
Summary: Tryton module to link stock and invoice
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.4/
+Download-URL: http://downloads.tryton.org/3.6/
Description: trytond_account_invoice_stock
=============================
@@ -64,5 +64,7 @@ Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
Classifier: Topic :: Office/Business
Classifier: Topic :: Office/Business :: Financial :: Accounting
diff --git a/trytond_account_invoice_stock.egg-info/requires.txt b/trytond_account_invoice_stock.egg-info/requires.txt
index 9da6f37..13e0a32 100644
--- a/trytond_account_invoice_stock.egg-info/requires.txt
+++ b/trytond_account_invoice_stock.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_account_invoice >= 3.4, < 3.5
-trytond_stock >= 3.4, < 3.5
-trytond_product >= 3.4, < 3.5
-trytond >= 3.4, < 3.5
\ No newline at end of file
+trytond_account_invoice >= 3.6, < 3.7
+trytond_stock >= 3.6, < 3.7
+trytond_product >= 3.6, < 3.7
+trytond >= 3.6, < 3.7
\ No newline at end of file
diff --git a/view/invoice_line_form.xml b/view/invoice_line_form.xml
index 5743cfa..f837e41 100644
--- a/view/invoice_line_form.xml
+++ b/view/invoice_line_form.xml
@@ -3,7 +3,7 @@
this repository contains the full copyright notices and license terms. -->
<data>
<xpath expr="/form/notebook/page[@id='general']" position="after">
- <page string="Stock" id="stock">
+ <page string="Stock" name="stock_moves">
<field name="stock_moves" colspan="4"/>
</page>
</xpath>
--
tryton-modules-account-invoice-stock
More information about the tryton-debian-vcs
mailing list