[tryton-debian-vcs] tryton-modules-purchase-invoice-line-standalone branch upstream updated. upstream/3.2.0-1-g164de86
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Oct 23 12:17:37 UTC 2014
The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-purchase-invoice-line-standalone.git;a=commitdiff;h=upstream/3.2.0-1-g164de86
commit 164de86463059e7b68310f884fb8c3942ff4c9e5
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Oct 21 11:29:18 2014 +0200
Adding upstream version 3.4.0.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index bdc7cca..c8f180f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.4.0 - 2014-10-20
+* Bug fixes (see mercurial logs for details)
+
Version 3.2.0 - 2014-04-21
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 33d8a8c..f569713 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_purchase_invoice_line_standalone
-Version: 3.2.0
+Version: 3.4.0
Summary: Tryton module for standalone invoice line from purchase
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.2/
+Download-URL: http://downloads.tryton.org/3.4/
Description: trytond_purchase_invoice_line_standalone
========================================
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 45a430f..5f889ca 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -10,7 +10,7 @@ msgstr ""
msgctxt "field:purchase.purchase,invoice_lines:"
msgid "Invoice Lines"
-msgstr "Rechnungspositionen Kunden"
+msgstr "Rechnungspositionen Lieferanten"
msgctxt "field:purchase.purchase,invoice_lines_ignored:"
msgid "Invoice Lines Ignored"
diff --git a/locale/de_DE.po b/locale/es_EC.po
similarity index 76%
copy from locale/de_DE.po
copy to locale/es_EC.po
index 45a430f..028b7be 100644
--- a/locale/de_DE.po
+++ b/locale/es_EC.po
@@ -4,25 +4,23 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:account.invoice.line:"
msgid "You can not delete invoice lines that comes from a purchase."
-msgstr ""
-"Aus einem Einkauf stammende Rechnungspositionen können nicht gelöscht "
-"werden."
+msgstr "No puede eliminar líneas de facturas generadas por una compra."
msgctxt "field:purchase.purchase,invoice_lines:"
msgid "Invoice Lines"
-msgstr "Rechnungspositionen Kunden"
+msgstr "Líneas de Factura"
msgctxt "field:purchase.purchase,invoice_lines_ignored:"
msgid "Invoice Lines Ignored"
-msgstr "Ignorierte Rechnungspositionen"
+msgstr "Líneas de Factura Ignoradas"
msgctxt "field:purchase.purchase-account.invoice.line,create_date:"
msgid "Create Date"
-msgstr "Erstellungsdatum"
+msgstr "Fecha de Creación"
msgctxt "field:purchase.purchase-account.invoice.line,create_uid:"
msgid "Create User"
-msgstr "Erstellt durch"
+msgstr "Creado por Usuario"
msgctxt "field:purchase.purchase-account.invoice.line,id:"
msgid "ID"
@@ -30,31 +28,31 @@ msgstr "ID"
msgctxt "field:purchase.purchase-account.invoice.line,line:"
msgid "Invoice Line"
-msgstr "Rechnungsposition Kunde"
+msgstr "Línea de Factura"
msgctxt "field:purchase.purchase-account.invoice.line,purchase:"
msgid "Purchase"
-msgstr "Einkauf"
+msgstr "Compra"
msgctxt "field:purchase.purchase-account.invoice.line,rec_name:"
msgid "Name"
-msgstr "Name"
+msgstr "Nombre"
msgctxt "field:purchase.purchase-account.invoice.line,write_date:"
msgid "Write Date"
-msgstr "Zuletzt geändert"
+msgstr "Fecha de Modificación"
msgctxt "field:purchase.purchase-account.invoice.line,write_uid:"
msgid "Write User"
-msgstr "Letzte Änderung durch"
+msgstr "Modificado por Usuario"
msgctxt "field:purchase.purchase-ignored-account.invoice.line,create_date:"
msgid "Create Date"
-msgstr "Erstellungsdatum"
+msgstr "Fecha de Creación"
msgctxt "field:purchase.purchase-ignored-account.invoice.line,create_uid:"
msgid "Create User"
-msgstr "Erstellt durch"
+msgstr "Creado por Usuario"
msgctxt "field:purchase.purchase-ignored-account.invoice.line,id:"
msgid "ID"
@@ -62,40 +60,40 @@ msgstr "ID"
msgctxt "field:purchase.purchase-ignored-account.invoice.line,invoice:"
msgid "Invoice Line"
-msgstr "Rechnungsposition Kunde"
+msgstr "Línea de Factura"
msgctxt "field:purchase.purchase-ignored-account.invoice.line,purchase:"
msgid "Purchase"
-msgstr "Einkauf"
+msgstr "Compra"
msgctxt "field:purchase.purchase-ignored-account.invoice.line,rec_name:"
msgid "Name"
-msgstr "Name"
+msgstr "Nombre"
msgctxt "field:purchase.purchase-ignored-account.invoice.line,write_date:"
msgid "Write Date"
-msgstr "Zuletzt geändert"
+msgstr "Fecha de Modificación"
msgctxt "field:purchase.purchase-ignored-account.invoice.line,write_uid:"
msgid "Write User"
-msgstr "Letzte Änderung durch"
+msgstr "Modificado por Usuario"
msgctxt "model:purchase.purchase-account.invoice.line,name:"
msgid "Purchase - Invoice Line"
-msgstr "Einkauf - Rechnungsposition"
+msgstr "Compra - Línea de Factura"
msgctxt "model:purchase.purchase-ignored-account.invoice.line,name:"
msgid "Purchase - Ignored Invoice Line"
-msgstr "Einkauf - Ignorierte Rechnungsposition"
+msgstr "Compra - Línea de Factura Ignorada"
msgctxt "view:account.invoice.line:"
msgid "Invoice Lines"
-msgstr "Rechnungspositionen"
+msgstr "Líneas de Factura"
msgctxt "wizard_button:purchase.handle.invoice.exception,ask,end:"
msgid "Cancel"
-msgstr "Abbrechen"
+msgstr "Cancelar"
msgctxt "wizard_button:purchase.handle.invoice.exception,ask,handle:"
msgid "Ok"
-msgstr "OK"
+msgstr "Aceptar"
diff --git a/locale/sl_SI.po b/locale/sl_SI.po
index 87e1cf0..01a8200 100644
--- a/locale/sl_SI.po
+++ b/locale/sl_SI.po
@@ -16,11 +16,11 @@ msgstr "Prezrte postavke računa"
msgctxt "field:purchase.purchase-account.invoice.line,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:purchase.purchase-account.invoice.line,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:purchase.purchase-account.invoice.line,id:"
msgid "ID"
@@ -48,11 +48,11 @@ msgstr "Zapisal"
msgctxt "field:purchase.purchase-ignored-account.invoice.line,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:purchase.purchase-ignored-account.invoice.line,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:purchase.purchase-ignored-account.invoice.line,id:"
msgid "ID"
diff --git a/purchase.py b/purchase.py
index 61dd9b0..355df42 100644
--- a/purchase.py
+++ b/purchase.py
@@ -53,18 +53,16 @@ class Purchase:
if invoice:
lines_to_delete = [l for l in invoice.lines if l.type != 'line']
lines = [l for l in invoice.lines if l.type == 'line']
- invoice_line_ids = [l.id for l in lines]
- with Transaction().set_user(0, set_context=True):
- InvoiceLine.write(lines, {
- 'invoice': None,
- 'invoice_type': invoice.type,
- 'party': invoice.party.id,
- 'currency': invoice.currency.id,
- 'company': invoice.company.id,
- })
- InvoiceLine.delete(lines_to_delete)
- Invoice.cancel([invoice])
- Invoice.delete([invoice])
+ InvoiceLine.write(lines, {
+ 'invoice': None,
+ 'invoice_type': invoice.type,
+ 'party': invoice.party.id,
+ 'currency': invoice.currency.id,
+ 'company': invoice.company.id,
+ })
+ InvoiceLine.delete(lines_to_delete)
+ Invoice.cancel([invoice])
+ Invoice.delete([invoice])
return None
return invoice
diff --git a/tests/scenario_purchase_invoice_line_standalone.rst b/tests/scenario_purchase_invoice_line_standalone.rst
index 2a9bfbe..459c6e4 100644
--- a/tests/scenario_purchase_invoice_line_standalone.rst
+++ b/tests/scenario_purchase_invoice_line_standalone.rst
@@ -183,11 +183,11 @@ Purchase 5 products::
>>> purchase.lines.append(purchase_line)
>>> purchase_line.type = 'subtotal'
>>> purchase_line.description = 'Subtotal'
- >>> purchase.save()
- >>> Purchase.quote([purchase.id], current_config.context)
- >>> Purchase.confirm([purchase.id], current_config.context)
+ >>> purchase.click('quote')
+ >>> purchase.click('confirm')
+ >>> purchase.click('process')
>>> purchase.state
- u'confirmed'
+ u'processing'
>>> purchase.reload()
>>> len(purchase.moves)
3
@@ -211,8 +211,7 @@ Create a supplier invoice::
Create a supplier invoice with an accountant::
- >>> current_config = config.set_trytond(user='accountant',
- ... password='accountant', database_name=current_config.database_name)
+ >>> current_config.user = accountant.id
>>> Invoice = Model.get('account.invoice')
>>> Partner = Model.get('party.party')
>>> supplier, = Partner.find([('name', '=', 'Supplier')])
diff --git a/tests/test_purchase_invoice_line_standalone.py b/tests/test_purchase_invoice_line_standalone.py
index c940a98..18a5461 100644
--- a/tests/test_purchase_invoice_line_standalone.py
+++ b/tests/test_purchase_invoice_line_standalone.py
@@ -3,7 +3,8 @@
import unittest
import doctest
import trytond.tests.test_tryton
-from trytond.tests.test_tryton import test_view, test_depends, doctest_dropdb
+from trytond.tests.test_tryton import test_view, test_depends
+from trytond.tests.test_tryton import doctest_setup, doctest_teardown
class PurchaseInvoiceLineStandaloneTestCase(unittest.TestCase):
@@ -28,6 +29,6 @@ def suite():
PurchaseInvoiceLineStandaloneTestCase))
suite.addTests(doctest.DocFileSuite(
'scenario_purchase_invoice_line_standalone.rst',
- setUp=doctest_dropdb, tearDown=doctest_dropdb, encoding='UTF-8',
+ setUp=doctest_setup, tearDown=doctest_teardown, encoding='UTF-8',
optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
return suite
diff --git a/tryton.cfg b/tryton.cfg
index 291c8dd..b976921 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.2.0
+version=3.4.0
depends:
account_invoice_line_standalone
ir
diff --git a/trytond_purchase_invoice_line_standalone.egg-info/PKG-INFO b/trytond_purchase_invoice_line_standalone.egg-info/PKG-INFO
index da58f6b..ffa8148 100644
--- a/trytond_purchase_invoice_line_standalone.egg-info/PKG-INFO
+++ b/trytond_purchase_invoice_line_standalone.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-purchase-invoice-line-standalone
-Version: 3.2.0
+Version: 3.4.0
Summary: Tryton module for standalone invoice line from purchase
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.2/
+Download-URL: http://downloads.tryton.org/3.4/
Description: trytond_purchase_invoice_line_standalone
========================================
diff --git a/trytond_purchase_invoice_line_standalone.egg-info/SOURCES.txt b/trytond_purchase_invoice_line_standalone.egg-info/SOURCES.txt
index d3ba62e..7b7dd0d 100644
--- a/trytond_purchase_invoice_line_standalone.egg-info/SOURCES.txt
+++ b/trytond_purchase_invoice_line_standalone.egg-info/SOURCES.txt
@@ -10,14 +10,32 @@ tryton.cfg
./__init__.py
./invoice.py
./purchase.py
+./purchase.xml
+./tryton.cfg
+./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_EC.po
+./locale/es_ES.po
+./locale/fr_FR.po
+./locale/nl_NL.po
+./locale/ru_RU.po
+./locale/sl_SI.po
./tests/__init__.py
+./tests/scenario_purchase_invoice_line_standalone.rst
./tests/test_purchase_invoice_line_standalone.py
+./view/invoice_line_tree_invoice_type.xml
+./view/purchase_form.xml
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_EC.po
locale/es_ES.po
locale/fr_FR.po
locale/nl_NL.po
diff --git a/trytond_purchase_invoice_line_standalone.egg-info/requires.txt b/trytond_purchase_invoice_line_standalone.egg-info/requires.txt
index ae551fc..1956e31 100644
--- a/trytond_purchase_invoice_line_standalone.egg-info/requires.txt
+++ b/trytond_purchase_invoice_line_standalone.egg-info/requires.txt
@@ -1,4 +1,4 @@
python-sql
-trytond_account_invoice_line_standalone >= 3.2, < 3.3
-trytond_purchase >= 3.2, < 3.3
-trytond >= 3.2, < 3.3
\ No newline at end of file
+trytond_account_invoice_line_standalone >= 3.4, < 3.5
+trytond_purchase >= 3.4, < 3.5
+trytond >= 3.4, < 3.5
\ No newline at end of file
--
tryton-modules-purchase-invoice-line-standalone
More information about the tryton-debian-vcs
mailing list