[tryton-debian-vcs] tryton-modules-purchase-invoice-line-standalone branch upstream created. 8070e62061b96cfed5671a49bb776901e467ebdc
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 17:07:54 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-purchase-invoice-line-standalone.git;a=commitdiff;h=8070e62061b96cfed5671a49bb776901e467ebdc
commit 8070e62061b96cfed5671a49bb776901e467ebdc
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 17:27:52 2013 +0100
Adding upstream version 3.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 1987e95..e2ce93d 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/INSTALL b/INSTALL
index 15e0b5b..d84ed9b 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,6 +6,7 @@ Prerequisites
* Python 2.6 or later (http://www.python.org/)
* trytond (http://www.tryton.org/)
+ * python-sql (http://code.google.com/p/python-sql/)
* trytond_purchase (http://www.tryton.org/)
* trytond_account_invoice_line_standalone (http://www.tryton.org/)
diff --git a/MANIFEST.in b/MANIFEST.in
index 18ce53c..2f9d677 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -9,3 +9,4 @@ include *.xml
include view/*.xml
include *.odt
include locale/*.po
+include tests/*.rst
diff --git a/PKG-INFO b/PKG-INFO
index 40d53ad..c00fdb5 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_purchase_invoice_line_standalone
-Version: 2.8.0
+Version: 3.0.0
Summary: Tryton module for standalone invoice line from purchase
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_purchase_invoice_line_standalone
=======================================
@@ -59,6 +59,7 @@ Classifier: Natural Language :: Dutch
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/locale/sl_SI.po b/locale/sl_SI.po
new file mode 100644
index 0000000..87e1cf0
--- /dev/null
+++ b/locale/sl_SI.po
@@ -0,0 +1,91 @@
+#
+msgid ""
+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 "Postavk računa, ki izhajajo iz nabavnega naloga, ni možno brisati."
+
+msgctxt "field:purchase.purchase,invoice_lines:"
+msgid "Invoice Lines"
+msgstr "Postavke računov"
+
+msgctxt "field:purchase.purchase,invoice_lines_ignored:"
+msgid "Invoice Lines Ignored"
+msgstr "Prezrte postavke računa"
+
+msgctxt "field:purchase.purchase-account.invoice.line,create_date:"
+msgid "Create Date"
+msgstr "Ustvarjeno"
+
+msgctxt "field:purchase.purchase-account.invoice.line,create_uid:"
+msgid "Create User"
+msgstr "Ustvaril"
+
+msgctxt "field:purchase.purchase-account.invoice.line,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:purchase.purchase-account.invoice.line,line:"
+msgid "Invoice Line"
+msgstr "Postavka računa"
+
+msgctxt "field:purchase.purchase-account.invoice.line,purchase:"
+msgid "Purchase"
+msgstr "Nabavni nalogi"
+
+msgctxt "field:purchase.purchase-account.invoice.line,rec_name:"
+msgid "Name"
+msgstr "Ime"
+
+msgctxt "field:purchase.purchase-account.invoice.line,write_date:"
+msgid "Write Date"
+msgstr "Zapisano"
+
+msgctxt "field:purchase.purchase-account.invoice.line,write_uid:"
+msgid "Write User"
+msgstr "Zapisal"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,create_date:"
+msgid "Create Date"
+msgstr "Ustvarjeno"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,create_uid:"
+msgid "Create User"
+msgstr "Ustvaril"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,invoice:"
+msgid "Invoice Line"
+msgstr "Postavka računa"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,purchase:"
+msgid "Purchase"
+msgstr "Nabavni nalogi"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,rec_name:"
+msgid "Name"
+msgstr "Ime"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,write_date:"
+msgid "Write Date"
+msgstr "Zapisano"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,write_uid:"
+msgid "Write User"
+msgstr "Zapisal"
+
+msgctxt "model:purchase.purchase-account.invoice.line,name:"
+msgid "Purchase - Invoice Line"
+msgstr "Nabavni nalog - Postavka računa"
+
+msgctxt "model:purchase.purchase-ignored-account.invoice.line,name:"
+msgid "Purchase - Ignored Invoice Line"
+msgstr "Nabavni nalog - Prezrta postavka računa"
+
+msgctxt "view:account.invoice.line:"
+msgid "Invoice Lines"
+msgstr "Postavke računa"
diff --git a/purchase.py b/purchase.py
index f1739bb..0f51b39 100644
--- a/purchase.py
+++ b/purchase.py
@@ -1,5 +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.
+from sql import Table
+from sql.functions import Overlay, Position
+
from trytond.model import ModelSQL, fields
from trytond.transaction import Transaction
from trytond.pool import Pool, PoolMeta
@@ -20,11 +23,15 @@ class Purchase:
@classmethod
def __register__(cls, module_name):
cursor = Transaction().cursor
+ model_data = Table('ir_model_data')
# Migration from 1.2: packing renamed into shipment
- cursor.execute("UPDATE ir_model_data "
- "SET fs_id = REPLACE(fs_id, 'packing', 'shipment') "
- "WHERE fs_id like '%%packing%%' "
- "AND module = %s", (module_name,))
+ cursor.execute(*model_data.update(
+ columns=[model_data.fs_id],
+ values=[Overlay(model_data.fs_id, 'shipment',
+ Position('packing', model_data.fs_id),
+ len('packing'))],
+ where=model_data.fs_id.like('%packing%')
+ & (model_data.module == module_name)))
super(Purchase, cls).__register__(module_name)
diff --git a/setup.py b/setup.py
index de66930..178cbba 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
major_version = int(major_version)
minor_version = int(minor_version)
-requires = []
+requires = ['python-sql']
for dep in info.get('depends', []):
if not re.match(r'(ir|res|webdav)(\W|$)', dep):
requires.append('trytond_%s >= %s.%s, < %s.%s' %
@@ -45,7 +45,8 @@ setup(name='trytond_purchase_invoice_line_standalone',
],
package_data={
'trytond.modules.purchase_invoice_line_standalone': (
- info.get('xml', []) + ['tryton.cfg', 'view/*.xml', 'locale/*.po']),
+ info.get('xml', []) + ['tryton.cfg', 'view/*.xml', 'locale/*.po',
+ 'tests/*.rst']),
},
classifiers=[
'Development Status :: 5 - Production/Stable',
@@ -63,6 +64,7 @@ setup(name='trytond_purchase_invoice_line_standalone',
'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 b1fbc57..544f41f 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_purchase_invoice_line_standalone import suite
+
+__all__ = ['suite']
diff --git a/tests/scenario_purchase_invoice_line_standalone.rst b/tests/scenario_purchase_invoice_line_standalone.rst
new file mode 100644
index 0000000..2a9bfbe
--- /dev/null
+++ b/tests/scenario_purchase_invoice_line_standalone.rst
@@ -0,0 +1,229 @@
+=========================================
+Purchase Invoice Line Standalone Scenario
+=========================================
+
+Imports::
+
+ >>> import datetime
+ >>> from dateutil.relativedelta import relativedelta
+ >>> from decimal import Decimal
+ >>> from operator import attrgetter
+ >>> from proteus import config, Model, Wizard
+ >>> today = datetime.date.today()
+
+Create database::
+
+ >>> current_config = config.set_trytond()
+ >>> current_config.pool.test = True
+
+Install purchase_invoice_line_standalone::
+
+ >>> Module = Model.get('ir.module.module')
+ >>> purchase_module, = Module.find([('name', '=',
+ ... 'purchase_invoice_line_standalone')])
+ >>> Module.install([purchase_module.id], current_config.context)
+ >>> Wizard('ir.module.module.install_upgrade').execute('upgrade')
+
+Create company::
+
+ >>> Currency = Model.get('currency.currency')
+ >>> CurrencyRate = Model.get('currency.currency.rate')
+ >>> currencies = Currency.find([('code', '=', 'EUR')])
+ >>> if not currencies:
+ ... currency = Currency(name='Euro', symbol=u'€', code='EUR',
+ ... rounding=Decimal('0.01'), mon_grouping='[3, 3, 0]',
+ ... mon_decimal_point=',')
+ ... currency.save()
+ ... CurrencyRate(date=today + relativedelta(month=1, day=1),
+ ... rate=Decimal('1.0'), currency=currency).save()
+ ... else:
+ ... currency, = currencies
+ >>> Company = Model.get('company.company')
+ >>> Party = Model.get('party.party')
+ >>> company_config = Wizard('company.company.config')
+ >>> company_config.execute('company')
+ >>> company = company_config.form
+ >>> party = Party(name='Dunder Mifflin')
+ >>> party.save()
+ >>> company.party = party
+ >>> company.currency = currency
+ >>> company_config.execute('add')
+ >>> company, = Company.find([])
+
+Reload the context::
+
+ >>> User = Model.get('res.user')
+ >>> current_config._context = User.get_preferences(True,
+ ... current_config.context)
+
+Create an accountant user::
+
+ >>> Group = Model.get('res.group')
+ >>> accountant = User()
+ >>> accountant.name = 'Accountant'
+ >>> accountant.login = 'accountant'
+ >>> accountant.password = 'accountant'
+ >>> account_group, = Group.find([('name', '=', 'Account')])
+ >>> accountant.groups.append(account_group)
+ >>> accountant.save()
+
+Create fiscal year::
+
+ >>> FiscalYear = Model.get('account.fiscalyear')
+ >>> Sequence = Model.get('ir.sequence')
+ >>> SequenceStrict = Model.get('ir.sequence.strict')
+ >>> fiscalyear = FiscalYear(name=str(today.year))
+ >>> fiscalyear.start_date = today + relativedelta(month=1, day=1)
+ >>> fiscalyear.end_date = today + relativedelta(month=12, day=31)
+ >>> fiscalyear.company = company
+ >>> post_move_seq = Sequence(name=str(today.year), code='account.move',
+ ... company=company)
+ >>> post_move_seq.save()
+ >>> fiscalyear.post_move_sequence = post_move_seq
+ >>> invoice_seq = SequenceStrict(name=str(today.year),
+ ... code='account.invoice', company=company)
+ >>> invoice_seq.save()
+ >>> fiscalyear.out_invoice_sequence = invoice_seq
+ >>> fiscalyear.in_invoice_sequence = invoice_seq
+ >>> fiscalyear.out_credit_note_sequence = invoice_seq
+ >>> fiscalyear.in_credit_note_sequence = invoice_seq
+ >>> fiscalyear.save()
+ >>> FiscalYear.create_period([fiscalyear.id], current_config.context)
+
+Create chart of accounts::
+
+ >>> AccountTemplate = Model.get('account.account.template')
+ >>> Account = Model.get('account.account')
+ >>> account_template, = AccountTemplate.find([('parent', '=', None)])
+ >>> create_chart = Wizard('account.create_chart')
+ >>> create_chart.execute('account')
+ >>> create_chart.form.account_template = account_template
+ >>> create_chart.form.company = company
+ >>> create_chart.execute('create_account')
+ >>> receivable, = Account.find([
+ ... ('kind', '=', 'receivable'),
+ ... ('company', '=', company.id),
+ ... ])
+ >>> payable, = Account.find([
+ ... ('kind', '=', 'payable'),
+ ... ('company', '=', company.id),
+ ... ])
+ >>> revenue, = Account.find([
+ ... ('kind', '=', 'revenue'),
+ ... ('company', '=', company.id),
+ ... ])
+ >>> expense, = Account.find([
+ ... ('kind', '=', 'expense'),
+ ... ('company', '=', company.id),
+ ... ])
+ >>> create_chart.form.account_receivable = receivable
+ >>> create_chart.form.account_payable = payable
+ >>> create_chart.execute('create_properties')
+
+Create parties::
+
+ >>> Party = Model.get('party.party')
+ >>> supplier = Party(name='Supplier')
+ >>> supplier.save()
+ >>> customer = Party(name='Customer')
+ >>> customer.save()
+
+Create product::
+
+ >>> ProductUom = Model.get('product.uom')
+ >>> unit, = ProductUom.find([('name', '=', 'Unit')])
+ >>> ProductTemplate = Model.get('product.template')
+ >>> Product = Model.get('product.product')
+ >>> product = Product()
+ >>> template = ProductTemplate()
+ >>> template.name = 'product'
+ >>> template.default_uom = unit
+ >>> template.type = 'goods'
+ >>> template.purchasable = True
+ >>> template.salable = True
+ >>> template.list_price = Decimal('10')
+ >>> template.cost_price = Decimal('5')
+ >>> template.cost_price_method = 'fixed'
+ >>> template.account_expense = expense
+ >>> template.account_revenue = revenue
+ >>> template.save()
+ >>> product.template = template
+ >>> product.save()
+
+Create payment term::
+
+ >>> PaymentTerm = Model.get('account.invoice.payment_term')
+ >>> PaymentTermLine = Model.get('account.invoice.payment_term.line')
+ >>> payment_term = PaymentTerm(name='Direct')
+ >>> payment_term_line = PaymentTermLine(type='remainder', days=0)
+ >>> payment_term.lines.append(payment_term_line)
+ >>> payment_term.save()
+
+Purchase 5 products::
+
+ >>> Purchase = Model.get('purchase.purchase')
+ >>> PurchaseLine = Model.get('purchase.line')
+ >>> purchase = Purchase()
+ >>> purchase.party = supplier
+ >>> purchase.payment_term = payment_term
+ >>> purchase.invoice_method = 'order'
+ >>> purchase_line = PurchaseLine()
+ >>> purchase.lines.append(purchase_line)
+ >>> purchase_line.product = product
+ >>> purchase_line.quantity = 2.0
+ >>> purchase_line = PurchaseLine()
+ >>> purchase.lines.append(purchase_line)
+ >>> purchase_line.product = product
+ >>> purchase_line.quantity = 3.0
+ >>> purchase_line = PurchaseLine()
+ >>> purchase.lines.append(purchase_line)
+ >>> purchase_line.product = product
+ >>> purchase_line.quantity = 4.0
+ >>> purchase_line = PurchaseLine()
+ >>> 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.state
+ u'confirmed'
+ >>> purchase.reload()
+ >>> len(purchase.moves)
+ 3
+ >>> len(purchase.shipment_returns)
+ 0
+ >>> len(purchase.invoices)
+ 0
+
+
+Create a supplier invoice::
+
+ >>> Invoice = Model.get('account.invoice')
+ >>> invoice = Invoice()
+ >>> invoice.type = 'in_invoice'
+ >>> invoice.party = supplier
+ >>> len(invoice.lines.find())
+ 3
+ >>> line1 = invoice.lines.find()[0]
+ >>> invoice.lines.append(line1)
+ >>> invoice.save()
+
+Create a supplier invoice with an accountant::
+
+ >>> current_config = config.set_trytond(user='accountant',
+ ... password='accountant', database_name=current_config.database_name)
+ >>> Invoice = Model.get('account.invoice')
+ >>> Partner = Model.get('party.party')
+ >>> supplier, = Partner.find([('name', '=', 'Supplier')])
+
+ >>> invoice = Invoice()
+ >>> invoice.type = 'in_invoice'
+ >>> invoice.party = supplier
+ >>> len(invoice.lines.find())
+ 2
+ >>> _ = [invoice.lines.append(l) for l in invoice.lines.find()]
+ >>> invoice.save()
+
+ >>> _ = invoice.lines.pop()
+ >>> invoice.save()
diff --git a/tryton.cfg b/tryton.cfg
index 69a5a03..bc4ef82 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.8.0
+version=3.0.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 e7cb18c..6c23d8c 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: 2.8.0
+Version: 3.0.0
Summary: Tryton module for standalone invoice line from purchase
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_purchase_invoice_line_standalone
=======================================
@@ -59,6 +59,7 @@ Classifier: Natural Language :: Dutch
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_purchase_invoice_line_standalone.egg-info/SOURCES.txt b/trytond_purchase_invoice_line_standalone.egg-info/SOURCES.txt
index 94ef7d2..d3ba62e 100644
--- a/trytond_purchase_invoice_line_standalone.egg-info/SOURCES.txt
+++ b/trytond_purchase_invoice_line_standalone.egg-info/SOURCES.txt
@@ -22,6 +22,8 @@ locale/es_ES.po
locale/fr_FR.po
locale/nl_NL.po
locale/ru_RU.po
+locale/sl_SI.po
+tests/scenario_purchase_invoice_line_standalone.rst
trytond_purchase_invoice_line_standalone.egg-info/PKG-INFO
trytond_purchase_invoice_line_standalone.egg-info/SOURCES.txt
trytond_purchase_invoice_line_standalone.egg-info/dependency_links.txt
diff --git a/trytond_purchase_invoice_line_standalone.egg-info/requires.txt b/trytond_purchase_invoice_line_standalone.egg-info/requires.txt
index 6156184..c4605c3 100644
--- a/trytond_purchase_invoice_line_standalone.egg-info/requires.txt
+++ b/trytond_purchase_invoice_line_standalone.egg-info/requires.txt
@@ -1,3 +1,4 @@
-trytond_account_invoice_line_standalone >= 2.8, < 2.9
-trytond_purchase >= 2.8, < 2.9
-trytond >= 2.8, < 2.9
\ No newline at end of file
+python-sql
+trytond_account_invoice_line_standalone >= 3.0, < 3.1
+trytond_purchase >= 3.0, < 3.1
+trytond >= 3.0, < 3.1
\ No newline at end of file
commit 256c16b3fba65ff20a2a45b227201bfa54496a9e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu May 2 00:37:23 2013 +0200
Adding upstream version 2.8.0.
diff --git a/CHANGELOG b/CHANGELOG
index de893be..1987e95 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Version 2.6.1 - 2013-02-12
+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 d7165c7..9192c97 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
Copyright (C) 2008-2013 Cédric Krier.
-Copyright (C) 2008-2012 Bertrand Chenal.
+Copyright (C) 2008-2013 Bertrand Chenal.
Copyright (C) 2008-2013 B2CK SPRL.
This program is free software: you can redistribute it and/or modify
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 2a8f89e..40d53ad 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_purchase_invoice_line_standalone
-Version: 2.6.1
+Version: 2.8.0
Summary: Tryton module for standalone invoice line from purchase
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_purchase_invoice_line_standalone
=======================================
@@ -52,6 +52,7 @@ Classifier: Intended Audience :: Legal Industry
Classifier: Intended Audience :: Manufacturing
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Catalan
Classifier: Natural Language :: Czech
Classifier: Natural Language :: English
Classifier: Natural Language :: Dutch
diff --git a/invoice.py b/invoice.py
index ce10a6e..726059b 100644
--- a/invoice.py
+++ b/invoice.py
@@ -14,9 +14,9 @@ class InvoiceLine:
def __setup__(cls):
super(InvoiceLine, cls).__setup__()
cls._error_messages.update({
- 'delete_purchase_invoice_line': 'You can not delete ' \
- 'invoice lines that comes from a purchase!',
- })
+ 'delete_purchase_invoice_line': ('You can not delete '
+ 'invoice lines that comes from a purchase.'),
+ })
@classmethod
def write(cls, lines, vals):
@@ -47,11 +47,8 @@ class InvoiceLine:
@classmethod
def delete(cls, lines):
- cursor = Transaction().cursor
- if lines:
- cursor.execute('SELECT id FROM purchase_invoice_line_rel ' \
- 'WHERE line IN (' + ','.join(['%s' for x in lines]) + ')',
- [l.id for l in lines])
- if cursor.rowcount:
- cls.raise_user_error('delete_purchase_invoice_line')
+ PurchaseLine = Pool().get('purchase.line')
+ if any(l for l in lines
+ if isinstance(l.origin, PurchaseLine) and l.type == 'line'):
+ cls.raise_user_error('delete_purchase_invoice_line')
super(InvoiceLine, cls).delete(lines)
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 70cfeb4..e686969 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -3,8 +3,8 @@ msgid ""
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 "Не може да изтривате редове от фактура която идва от покупка!"
+msgid "You can not delete invoice lines that comes from a purchase."
+msgstr ""
msgctxt "field:purchase.purchase,invoice_lines:"
msgid "Invoice Lines"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index c75fb0d..bd95257 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -3,8 +3,8 @@ msgid ""
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 "No pot esborrar línies que vénen d'una compra"
+msgid "You can not delete invoice lines that comes from a purchase."
+msgstr "No podeu esborrar línies de factures generades des d'una compra."
msgctxt "field:purchase.purchase,invoice_lines:"
msgid "Invoice Lines"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index 8df222d..cd490ca 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -3,7 +3,7 @@ msgid ""
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!"
+msgid "You can not delete invoice lines that comes from a purchase."
msgstr ""
msgctxt "field:purchase.purchase,invoice_lines:"
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 361f014..45a430f 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -3,10 +3,10 @@ msgid ""
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!"
+msgid "You can not delete invoice lines that comes from a purchase."
msgstr ""
"Aus einem Einkauf stammende Rechnungspositionen können nicht gelöscht "
-"werden!"
+"werden."
msgctxt "field:purchase.purchase,invoice_lines:"
msgid "Invoice Lines"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index 50efecb..c54be9c 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -3,8 +3,8 @@ msgid ""
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 "¡No puede borrar líneas que vienen de una compra!"
+msgid "You can not delete invoice lines that comes from a purchase."
+msgstr "No puede eliminar líneas de facturas generadas por una compra."
msgctxt "field:purchase.purchase,invoice_lines:"
msgid "Invoice Lines"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 0b86c88..713d716 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -3,8 +3,8 @@ msgid ""
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 "¡No puede eliminar líneas que vienen de una compra!"
+msgid "You can not delete invoice lines that comes from a purchase."
+msgstr "No puede eliminar líneas de factura generadas por una compra."
msgctxt "field:purchase.purchase,invoice_lines:"
msgid "Invoice Lines"
@@ -12,7 +12,7 @@ msgstr "Líneas de Factura"
msgctxt "field:purchase.purchase,invoice_lines_ignored:"
msgid "Invoice Lines Ignored"
-msgstr "Líneas de Factura ignoradas"
+msgstr "Líneas de Factura Ignoradas"
msgctxt "field:purchase.purchase-account.invoice.line,create_date:"
msgid "Create Date"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 477ce20..1d79cd9 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -3,8 +3,8 @@ msgid ""
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 "No puede eliminar líneas que vienen de una compra."
+msgid "You can not delete invoice lines that comes from a purchase."
+msgstr "No puede borrar líneas de facturas generadas por una compra."
msgctxt "field:purchase.purchase,invoice_lines:"
msgid "Invoice Lines"
@@ -86,17 +86,14 @@ msgctxt "model:purchase.purchase-ignored-account.invoice.line,name:"
msgid "Purchase - Ignored Invoice Line"
msgstr "Compra - Línea de factura ignorada"
-#, fuzzy
msgctxt "view:account.invoice.line:"
msgid "Invoice Lines"
msgstr "Líneas de factura"
-#, fuzzy
msgctxt "wizard_button:purchase.handle.invoice.exception,ask,end:"
msgid "Cancel"
msgstr "Cancelar"
-#, fuzzy
msgctxt "wizard_button:purchase.handle.invoice.exception,ask,handle:"
msgid "Ok"
msgstr "Aceptar"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 6f2d290..8b4828e 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -3,14 +3,9 @@ msgid ""
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!"
+msgid "You can not delete invoice lines that comes from a purchase."
msgstr ""
-"Vous ne pouvez pas supprimer des lignes de facture qui viennent d'un achat !"
-
-msgctxt "error:account.invoice.line:"
-msgid "You can not delete invoice lines that comes from a purchase!"
-msgstr ""
-"Vous ne pouvez pas supprimer des lignes de facture qui viennent d'un achat !"
+"Vous ne pouvez supprimer des lignes de facture qui proviennent d'un achat."
msgctxt "field:purchase.purchase,invoice_lines:"
msgid "Invoice Lines"
@@ -96,12 +91,10 @@ msgctxt "view:account.invoice.line:"
msgid "Invoice Lines"
msgstr "Lignes de factures"
-#, fuzzy
msgctxt "wizard_button:purchase.handle.invoice.exception,ask,end:"
msgid "Cancel"
-msgstr "Annulé"
+msgstr "Annuler"
-#, fuzzy
msgctxt "wizard_button:purchase.handle.invoice.exception,ask,handle:"
msgid "Ok"
msgstr "Ok"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index 6de0569..fbf26e0 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -3,7 +3,7 @@ msgid ""
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!"
+msgid "You can not delete invoice lines that comes from a purchase."
msgstr ""
#, fuzzy
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 17a02db..8790bcd 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -3,82 +3,97 @@ msgid ""
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!"
+msgid "You can not delete invoice lines that comes from a purchase."
msgstr ""
+#, fuzzy
msgctxt "field:purchase.purchase,invoice_lines:"
msgid "Invoice Lines"
-msgstr ""
+msgstr "Строки инвойса"
msgctxt "field:purchase.purchase,invoice_lines_ignored:"
msgid "Invoice Lines Ignored"
msgstr ""
+#, fuzzy
msgctxt "field:purchase.purchase-account.invoice.line,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Дата создания"
+#, fuzzy
msgctxt "field:purchase.purchase-account.invoice.line,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Создано пользователем"
+#, fuzzy
msgctxt "field:purchase.purchase-account.invoice.line,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
+#, fuzzy
msgctxt "field:purchase.purchase-account.invoice.line,line:"
msgid "Invoice Line"
-msgstr ""
+msgstr "Строка инвойса"
+#, fuzzy
msgctxt "field:purchase.purchase-account.invoice.line,purchase:"
msgid "Purchase"
-msgstr ""
+msgstr "Покупки"
#, fuzzy
msgctxt "field:purchase.purchase-account.invoice.line,rec_name:"
msgid "Name"
msgstr "Наименование"
+#, fuzzy
msgctxt "field:purchase.purchase-account.invoice.line,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Дата изменения"
+#, fuzzy
msgctxt "field:purchase.purchase-account.invoice.line,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Изменено пользователем"
+#, fuzzy
msgctxt "field:purchase.purchase-ignored-account.invoice.line,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Дата создания"
+#, fuzzy
msgctxt "field:purchase.purchase-ignored-account.invoice.line,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Создано пользователем"
+#, fuzzy
msgctxt "field:purchase.purchase-ignored-account.invoice.line,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
+#, fuzzy
msgctxt "field:purchase.purchase-ignored-account.invoice.line,invoice:"
msgid "Invoice Line"
-msgstr ""
+msgstr "Строка инвойса"
+#, fuzzy
msgctxt "field:purchase.purchase-ignored-account.invoice.line,purchase:"
msgid "Purchase"
-msgstr ""
+msgstr "Покупки"
#, fuzzy
msgctxt "field:purchase.purchase-ignored-account.invoice.line,rec_name:"
msgid "Name"
msgstr "Наименование"
+#, fuzzy
msgctxt "field:purchase.purchase-ignored-account.invoice.line,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Дата изменения"
+#, fuzzy
msgctxt "field:purchase.purchase-ignored-account.invoice.line,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Изменено пользователем"
msgctxt "model:purchase.purchase-account.invoice.line,name:"
msgid "Purchase - Invoice Line"
@@ -88,9 +103,10 @@ msgctxt "model:purchase.purchase-ignored-account.invoice.line,name:"
msgid "Purchase - Ignored Invoice Line"
msgstr ""
+#, fuzzy
msgctxt "view:account.invoice.line:"
msgid "Invoice Lines"
-msgstr ""
+msgstr "Строки инвойса"
#, fuzzy
msgctxt "wizard_button:purchase.handle.invoice.exception,ask,end:"
diff --git a/purchase.py b/purchase.py
index db1fd1e..f1739bb 100644
--- a/purchase.py
+++ b/purchase.py
@@ -21,10 +21,10 @@ class Purchase:
def __register__(cls, module_name):
cursor = Transaction().cursor
# Migration from 1.2: packing renamed into shipment
- cursor.execute("UPDATE ir_model_data "\
- "SET fs_id = REPLACE(fs_id, 'packing', 'shipment') "\
- "WHERE fs_id like '%%packing%%' "\
- "AND module = %s", (module_name,))
+ cursor.execute("UPDATE ir_model_data "
+ "SET fs_id = REPLACE(fs_id, 'packing', 'shipment') "
+ "WHERE fs_id like '%%packing%%' "
+ "AND module = %s", (module_name,))
super(Purchase, cls).__register__(module_name)
@@ -36,15 +36,18 @@ class Purchase:
invoice = super(Purchase, self).create_invoice(invoice_type)
if invoice:
- invoice_line_ids = [l.id for l in invoice.lines]
+ 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(invoice.lines, {
+ 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)
self.write([self], {
'invoices': [('unlink', [invoice.id])],
'invoice_lines': [('add', invoice_line_ids)],
diff --git a/purchase.xml b/purchase.xml
index a7a757d..0339296 100644
--- a/purchase.xml
+++ b/purchase.xml
@@ -7,40 +7,12 @@ this repository contains the full copyright notices and license terms. -->
<field name="model">account.invoice.line</field>
<field name="type">tree</field>
<field name="priority" eval="30"/>
- <field name="arch" type="xml">
- <![CDATA[
- <tree string="Invoice Lines">
- <field name="invoice"/>
- <field name="invoice_type"/>
- <field name="type"/>
- <field name="product"/>
- <field name="account"/>
- <field name="description"/>
- <field name="quantity"/>
- <field name="unit"/>
- <field name="unit_price"/>
- <field name="taxes"/>
- <field name="amount"/>
- <field name="unit_digits" tree_invisible="1"/>
- <field name="currency_digits" tree_invisible="1"/>
- </tree>
- ]]>
- </field>
+ <field name="name">invoice_line_tree_invoice_type</field>
</record>
<record model="ir.ui.view" id="purchase_view_form">
<field name="model">purchase.purchase</field>
<field name="inherit" ref="purchase.purchase_view_form"/>
- <field name="arch" type="xml">
- <![CDATA[
- <data>
- <xpath
- expr="/form/notebook/page/field[@name="invoices"]"
- position="after">
- <field name="invoice_lines" colspan="4" view_ids="purchase_invoice_line_standalone.invoice_line_invoice_type"/>
- </xpath>
- </data>
- ]]>
- </field>
+ <field name="name">purchase_form</field>
</record>
</data>
</tryton>
diff --git a/setup.py b/setup.py
index b76f831..de66930 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_purchase_invoice_line_standalone',
version=info.get('version', '0.0.1'),
@@ -36,16 +36,16 @@ setup(name='trytond_purchase_invoice_line_standalone',
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.purchase_invoice_line_standalone': '.'},
packages=[
'trytond.modules.purchase_invoice_line_standalone',
'trytond.modules.purchase_invoice_line_standalone.tests',
],
package_data={
- 'trytond.modules.purchase_invoice_line_standalone': \
- info.get('xml', []) + ['tryton.cfg', 'locale/*.po'],
+ 'trytond.modules.purchase_invoice_line_standalone': (
+ info.get('xml', []) + ['tryton.cfg', 'view/*.xml', 'locale/*.po']),
},
classifiers=[
'Development Status :: 5 - Production/Stable',
@@ -56,6 +56,7 @@ setup(name='trytond_purchase_invoice_line_standalone',
'Intended Audience :: Manufacturing',
'License :: OSI Approved :: GNU General Public License (GPL)',
'Natural Language :: Bulgarian',
+ 'Natural Language :: Catalan',
'Natural Language :: Czech',
'Natural Language :: English',
'Natural Language :: Dutch',
diff --git a/tryton.cfg b/tryton.cfg
index aba2d9a..69a5a03 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.6.1
+version=2.8.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 1903646..e7cb18c 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: 2.6.1
+Version: 2.8.0
Summary: Tryton module for standalone invoice line from purchase
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_purchase_invoice_line_standalone
=======================================
@@ -52,6 +52,7 @@ Classifier: Intended Audience :: Legal Industry
Classifier: Intended Audience :: Manufacturing
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Catalan
Classifier: Natural Language :: Czech
Classifier: Natural Language :: English
Classifier: Natural Language :: Dutch
diff --git a/trytond_purchase_invoice_line_standalone.egg-info/SOURCES.txt b/trytond_purchase_invoice_line_standalone.egg-info/SOURCES.txt
index a97e231..94ef7d2 100644
--- a/trytond_purchase_invoice_line_standalone.egg-info/SOURCES.txt
+++ b/trytond_purchase_invoice_line_standalone.egg-info/SOURCES.txt
@@ -28,4 +28,6 @@ trytond_purchase_invoice_line_standalone.egg-info/dependency_links.txt
trytond_purchase_invoice_line_standalone.egg-info/entry_points.txt
trytond_purchase_invoice_line_standalone.egg-info/not-zip-safe
trytond_purchase_invoice_line_standalone.egg-info/requires.txt
-trytond_purchase_invoice_line_standalone.egg-info/top_level.txt
\ No newline at end of file
+trytond_purchase_invoice_line_standalone.egg-info/top_level.txt
+view/invoice_line_tree_invoice_type.xml
+view/purchase_form.xml
\ No newline at end of file
diff --git a/trytond_purchase_invoice_line_standalone.egg-info/requires.txt b/trytond_purchase_invoice_line_standalone.egg-info/requires.txt
index a5c541b..6156184 100644
--- a/trytond_purchase_invoice_line_standalone.egg-info/requires.txt
+++ b/trytond_purchase_invoice_line_standalone.egg-info/requires.txt
@@ -1,3 +1,3 @@
-trytond_account_invoice_line_standalone >= 2.6, < 2.7
-trytond_purchase >= 2.6, < 2.7
-trytond >= 2.6, < 2.7
\ No newline at end of file
+trytond_account_invoice_line_standalone >= 2.8, < 2.9
+trytond_purchase >= 2.8, < 2.9
+trytond >= 2.8, < 2.9
\ No newline at end of file
diff --git a/view/invoice_line_tree_invoice_type.xml b/view/invoice_line_tree_invoice_type.xml
new file mode 100644
index 0000000..aaf3a02
--- /dev/null
+++ b/view/invoice_line_tree_invoice_type.xml
@@ -0,0 +1,18 @@
+<?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. -->
+<tree string="Invoice Lines">
+ <field name="invoice"/>
+ <field name="invoice_type"/>
+ <field name="type"/>
+ <field name="product"/>
+ <field name="account"/>
+ <field name="description"/>
+ <field name="quantity"/>
+ <field name="unit"/>
+ <field name="unit_price"/>
+ <field name="taxes"/>
+ <field name="amount"/>
+ <field name="unit_digits" tree_invisible="1"/>
+ <field name="currency_digits" tree_invisible="1"/>
+</tree>
diff --git a/view/purchase_form.xml b/view/purchase_form.xml
new file mode 100644
index 0000000..8342d19
--- /dev/null
+++ b/view/purchase_form.xml
@@ -0,0 +1,9 @@
+<?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='invoices']" position="after">
+ <field name="invoice_lines" colspan="4"
+ view_ids="purchase_invoice_line_standalone.invoice_line_invoice_type"/>
+ </xpath>
+</data>
commit 3707b1a2ca5f5da6281cc6fe41a3eb62ae6a2b55
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri Feb 15 20:50:49 2013 +0100
Adding upstream version 2.6.1.
diff --git a/CHANGELOG b/CHANGELOG
index b09db52..de893be 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.1 - 2013-02-12
+* Bug fixes (see mercurial logs for details)
+
Version 2.6.0 - 2012-10-22
* Bug fixes (see mercurial logs for details)
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/PKG-INFO b/PKG-INFO
index 018f291..2a8f89e 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond_purchase_invoice_line_standalone
-Version: 2.6.0
+Version: 2.6.1
Summary: Tryton module for standalone invoice line from purchase
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/purchase.py b/purchase.py
index d98e64a..db1fd1e 100644
--- a/purchase.py
+++ b/purchase.py
@@ -41,7 +41,7 @@ class Purchase:
InvoiceLine.write(invoice.lines, {
'invoice': None,
'invoice_type': invoice.type,
- 'party': invoice.party,
+ 'party': invoice.party.id,
'currency': invoice.currency.id,
'company': invoice.company.id,
})
diff --git a/tryton.cfg b/tryton.cfg
index 530149f..aba2d9a 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.6.0
+version=2.6.1
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 e32396e..1903646 100644
--- a/trytond_purchase_invoice_line_standalone.egg-info/PKG-INFO
+++ b/trytond_purchase_invoice_line_standalone.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond-purchase-invoice-line-standalone
-Version: 2.6.0
+Version: 2.6.1
Summary: Tryton module for standalone invoice line from purchase
Home-page: http://www.tryton.org/
Author: Tryton
commit c36090d63f7ce4b1b04b53adb424dfe84c89537f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Oct 23 19:53:43 2012 +0200
Adding upstream version 2.6.0.
diff --git a/CHANGELOG b/CHANGELOG
index d1d055c..b09db52 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.0 - 2012-10-22
+* Bug fixes (see mercurial logs for details)
+
Version 2.4.0 - 2012-04-24
* 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 3dd8580..018f291 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,17 +1,48 @@
Metadata-Version: 1.0
Name: trytond_purchase_invoice_line_standalone
-Version: 2.4.0
-Summary:
-Change the purchase order behaviour to create standalone invoice lines instead of a
-complete invoice. This allow to compose invoices with lines originating
-from differents purchases.
-
+Version: 2.6.0
+Summary: Tryton module for standalone invoice line from purchase
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_purchase_invoice_line_standalone
+ =======================================
+
+ The account_purchase_line_standalone 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 e3e3961..3db3d08 100644
--- a/README
+++ b/README
@@ -2,7 +2,6 @@ trytond_purchase_invoice_line_standalone
=======================================
The account_purchase_line_standalone module of the Tryton application platform.
-See __tryton__.py
Installing
----------
diff --git a/__init__.py b/__init__.py
index 5a01bfc..26b3ece 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,5 +1,18 @@
#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 .purchase import *
from .invoice import *
+
+
+def register():
+ Pool.register(
+ Purchase,
+ PurchaseInvoiceLine,
+ PurchaseIgnoredInvoiceLine,
+ InvoiceLine,
+ module='purchase_invoice_line_standalone', type_='model')
+ Pool.register(
+ HandleInvoiceException,
+ module='purchase_invoice_line_standalone', type_='wizard')
diff --git a/__tryton__.py b/__tryton__.py
deleted file mode 100644
index 96b0fe6..0000000
--- a/__tryton__.py
+++ /dev/null
@@ -1,73 +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": "Purchase Invoice Line Standalone",
- "name_bg_BG": "Ред от независима фактура към покупка",
- 'name_ca_ES': 'Línia de factura de compra independent',
- "name_de_DE": "Einkauf ungebundene Rechnungsposition",
- "name_es_AR": "Línea de factura de compra independiente",
- "name_es_CO": "Línea de Factura autónoma en Compras",
- "name_es_ES": "Línea de factura de compra independiente",
- "name_fr_FR": "Ligne de facture autonome - Achat",
- "version": "2.4.0",
- "author": "B2CK",
- 'email': 'info at b2ck.com',
- 'website': 'http://www.tryton.org/',
- "description": '''
-Change the purchase order behaviour to create standalone invoice lines instead of a
-complete invoice. This allow to compose invoices with lines originating
-from differents purchases.
-''',
- "description_bg_BG": '''Покупка с независима фактура
- - Промяна на поведението при поръчка за покупка като вместо пълна фактура
- създава редове с независими фактури.
- - Позволява създаване на фактури с редове от различни покупки.
-''',
- 'description_ca_ES': '''Modifica el comportament de les comandes de compra
-perquè crei línies de factura enlloc d'una factura completa. Això permet crear
-factures amb línies provinents de diferents compres.
-''',
- "description_de_DE": '''Einkäufe mit ungebundenen Rechnungspositionen
- - Ändert das Verhalten im Einkaufsvorgang, indem unabhängige Rechnungspositionen
- an Stelle einer kompletten Rechnung erstellt werden.
- - Ermöglicht die Zusammenstellung von Rechnungen aus Einkaufspositionen
- verschiedener Einkäufe.
-''',
- "description_es_AR": '''
-Modifica el comportamiento de la orden de compra permitiendo crear líneas
-independientes en lugar de una factura completa. Esto permite componer
-facturas con líneas originadas en diferentes compras.
-''',
- "description_es_CO": '''Modifica el comportamiento de orden de compra permitiendo crear
-líneas autónomas en lugar de una factura completa. Permite componer facturas con
-líneas originadas en diferentes compras.
-''',
- "description_es_ES": '''Modifica el comportamiento de los pedidos de compra permitiendo crear
-líneas de factura independientes en lugar de una factura completa. Esto permite crear
-facturas con líneas que procedan de distintas compras.
-''',
- "description_fr_FR": '''Modifie le comportement de l'ordre d'achat pour créer des lignes de
-facture autonomes au lieu de factures complètes. Cela permet de
-composer des factures avec des lignes provenant de différents achats.
-''',
- "depends": [
- "ir",
- "purchase",
- "account_invoice_line_standalone",
- ],
- "xml": [
- "purchase.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 e8ee3ad..ce10a6e 100644
--- a/invoice.py
+++ b/invoice.py
@@ -1,60 +1,57 @@
#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 ModelView, ModelSQL
from trytond.transaction import Transaction
-from trytond.pool import Pool
+from trytond.pool import Pool, PoolMeta
+__all__ = ['InvoiceLine']
+__metaclass__ = PoolMeta
-class InvoiceLine(ModelSQL, ModelView):
- _name = 'account.invoice.line'
- def __init__(self):
- super(InvoiceLine, self).__init__()
- self._error_messages.update({
+class InvoiceLine:
+ __name__ = 'account.invoice.line'
+
+ @classmethod
+ def __setup__(cls):
+ super(InvoiceLine, cls).__setup__()
+ cls._error_messages.update({
'delete_purchase_invoice_line': 'You can not delete ' \
'invoice lines that comes from a purchase!',
})
- def write(self, ids, vals):
- purchase_obj = Pool().get('purchase.purchase')
+ @classmethod
+ def write(cls, lines, vals):
+ Purchase = Pool().get('purchase.purchase')
if 'invoice' in vals:
- if isinstance(ids, (int, long)):
- ids = [ids]
-
- purchase_ids = purchase_obj.search([
- ('invoice_lines', 'in', ids),
- ])
- if vals['invoice']:
- purchase_obj.write(purchase_ids, {
- 'invoices': [('add', vals['invoice'])],
- })
- else:
- purchases = purchase_obj.browse(purchase_ids)
- for purchase in purchases:
- invoice_ids = list(set([x.invoice.id for x \
- in purchase.invoice_lines \
- if x.invoice and x.id in ids]) - \
- set([x.invoice.id for x \
- in purchase.invoice_lines \
- if x.invoice and x.id not in ids]))
- purchase_obj.write(purchase.id, {
- 'invoices': [('unlink', invoice_ids)],
+ with Transaction().set_user(0, set_context=True):
+ purchases = Purchase.search([
+ ('invoice_lines', 'in', [l.id for l in lines]),
+ ])
+ if vals['invoice']:
+ Purchase.write(purchases, {
+ 'invoices': [('add', [vals['invoice']])],
})
-
- return super(InvoiceLine, self).write(ids, vals)
-
- def delete(self, ids):
+ else:
+ for purchase in purchases:
+ invoice_ids = list(set([x.invoice.id for x
+ in purchase.invoice_lines
+ if x.invoice and x.id in lines])
+ - set([x.invoice.id for x
+ in purchase.invoice_lines
+ if x.invoice and x.id not in lines]))
+ Purchase.write([purchase], {
+ 'invoices': [('unlink', invoice_ids)],
+ })
+
+ return super(InvoiceLine, cls).write(lines, vals)
+
+ @classmethod
+ def delete(cls, lines):
cursor = Transaction().cursor
- if not ids:
- return True
- if isinstance(ids, (int, long)):
- ids = [ids]
- cursor.execute('SELECT id FROM purchase_invoice_line_rel ' \
- 'WHERE line IN (' + ','.join(['%s' for x in ids]) + ')',
- ids)
- if cursor.rowcount:
- self.raise_user_error('delete_purchase_invoice_line')
- return super(InvoiceLine, self).delete(ids)
-
-InvoiceLine()
+ if lines:
+ cursor.execute('SELECT id FROM purchase_invoice_line_rel ' \
+ 'WHERE line IN (' + ','.join(['%s' for x in lines]) + ')',
+ [l.id for l in lines])
+ if cursor.rowcount:
+ cls.raise_user_error('delete_purchase_invoice_line')
+ super(InvoiceLine, cls).delete(lines)
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index a28842f..70cfeb4 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -85,3 +85,18 @@ msgstr "Покупка - Ред от фактура"
msgctxt "model:purchase.purchase-ignored-account.invoice.line,name:"
msgid "Purchase - Ignored Invoice Line"
msgstr "Покупка - Игнорирани редове от фактура"
+
+#, fuzzy
+msgctxt "view:account.invoice.line:"
+msgid "Invoice Lines"
+msgstr "Редове от фактура"
+
+#, fuzzy
+msgctxt "wizard_button:purchase.handle.invoice.exception,ask,end:"
+msgid "Cancel"
+msgstr "Отказване"
+
+#, fuzzy
+msgctxt "wizard_button:purchase.handle.invoice.exception,ask,handle:"
+msgid "Ok"
+msgstr "Добре"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index f44d108..c75fb0d 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -16,16 +16,15 @@ msgstr "Línies de factura ignorades"
msgctxt "field:purchase.purchase-account.invoice.line,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Data creació"
-#, fuzzy
msgctxt "field:purchase.purchase-account.invoice.line,create_uid:"
msgid "Create User"
-msgstr "Crear usuari"
+msgstr "Usuari creació"
msgctxt "field:purchase.purchase-account.invoice.line,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:purchase.purchase-account.invoice.line,line:"
msgid "Invoice Line"
@@ -41,24 +40,23 @@ msgstr "Nom"
msgctxt "field:purchase.purchase-account.invoice.line,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Data modificació"
msgctxt "field:purchase.purchase-account.invoice.line,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Usuari modificació"
msgctxt "field:purchase.purchase-ignored-account.invoice.line,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Data creació"
-#, fuzzy
msgctxt "field:purchase.purchase-ignored-account.invoice.line,create_uid:"
msgid "Create User"
-msgstr "Crear usuari"
+msgstr "Usuari creació"
msgctxt "field:purchase.purchase-ignored-account.invoice.line,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:purchase.purchase-ignored-account.invoice.line,invoice:"
msgid "Invoice Line"
@@ -74,11 +72,11 @@ msgstr "Nom"
msgctxt "field:purchase.purchase-ignored-account.invoice.line,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Data modificació"
msgctxt "field:purchase.purchase-ignored-account.invoice.line,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Usuari modificació"
msgctxt "model:purchase.purchase-account.invoice.line,name:"
msgid "Purchase - Invoice Line"
@@ -87,3 +85,15 @@ msgstr "Compra - Línia de factura"
msgctxt "model:purchase.purchase-ignored-account.invoice.line,name:"
msgid "Purchase - Ignored Invoice Line"
msgstr "Compra - Línia de factura ignorada"
+
+msgctxt "view:account.invoice.line:"
+msgid "Invoice Lines"
+msgstr "Línies de factura"
+
+msgctxt "wizard_button:purchase.handle.invoice.exception,ask,end:"
+msgid "Cancel"
+msgstr "Cancel·la"
+
+msgctxt "wizard_button:purchase.handle.invoice.exception,ask,handle:"
+msgid "Ok"
+msgstr "Dacord"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index 69dc354..8df222d 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -85,3 +85,15 @@ msgstr ""
msgctxt "model:purchase.purchase-ignored-account.invoice.line,name:"
msgid "Purchase - Ignored Invoice Line"
msgstr ""
+
+msgctxt "view:account.invoice.line:"
+msgid "Invoice Lines"
+msgstr ""
+
+msgctxt "wizard_button:purchase.handle.invoice.exception,ask,end:"
+msgid "Cancel"
+msgstr ""
+
+msgctxt "wizard_button:purchase.handle.invoice.exception,ask,handle:"
+msgid "Ok"
+msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 56fd946..361f014 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -87,3 +87,15 @@ msgstr "Einkauf - Rechnungsposition"
msgctxt "model:purchase.purchase-ignored-account.invoice.line,name:"
msgid "Purchase - Ignored Invoice Line"
msgstr "Einkauf - Ignorierte Rechnungsposition"
+
+msgctxt "view:account.invoice.line:"
+msgid "Invoice Lines"
+msgstr "Rechnungspositionen"
+
+msgctxt "wizard_button:purchase.handle.invoice.exception,ask,end:"
+msgid "Cancel"
+msgstr "Abbrechen"
+
+msgctxt "wizard_button:purchase.handle.invoice.exception,ask,handle:"
+msgid "Ok"
+msgstr "OK"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index 82c85b2..50efecb 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -85,3 +85,15 @@ msgstr "Compra - Línea de factura"
msgctxt "model:purchase.purchase-ignored-account.invoice.line,name:"
msgid "Purchase - Ignored Invoice Line"
msgstr "Compra - Línea de factura ignorada"
+
+msgctxt "view:account.invoice.line:"
+msgid "Invoice Lines"
+msgstr "Líneas de factura"
+
+msgctxt "wizard_button:purchase.handle.invoice.exception,ask,end:"
+msgid "Cancel"
+msgstr "Cancelar"
+
+msgctxt "wizard_button:purchase.handle.invoice.exception,ask,handle:"
+msgid "Ok"
+msgstr "Aceptar"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index a14fc60..0b86c88 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -16,16 +16,15 @@ msgstr "Líneas de Factura ignoradas"
msgctxt "field:purchase.purchase-account.invoice.line,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Fecha de Creación"
-#, fuzzy
msgctxt "field:purchase.purchase-account.invoice.line,create_uid:"
msgid "Create User"
-msgstr "Crear usuario"
+msgstr "Creado por Usuario"
msgctxt "field:purchase.purchase-account.invoice.line,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:purchase.purchase-account.invoice.line,line:"
msgid "Invoice Line"
@@ -41,24 +40,23 @@ msgstr "Nombre"
msgctxt "field:purchase.purchase-account.invoice.line,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Fecha de Modificación"
msgctxt "field:purchase.purchase-account.invoice.line,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Modificado por Usuario"
msgctxt "field:purchase.purchase-ignored-account.invoice.line,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Fecha de Creación"
-#, fuzzy
msgctxt "field:purchase.purchase-ignored-account.invoice.line,create_uid:"
msgid "Create User"
-msgstr "Crear usuario"
+msgstr "Creado por Usuario"
msgctxt "field:purchase.purchase-ignored-account.invoice.line,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:purchase.purchase-ignored-account.invoice.line,invoice:"
msgid "Invoice Line"
@@ -74,11 +72,11 @@ msgstr "Nombre"
msgctxt "field:purchase.purchase-ignored-account.invoice.line,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Fecha de Modificación"
msgctxt "field:purchase.purchase-ignored-account.invoice.line,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Modificado por Usuario"
msgctxt "model:purchase.purchase-account.invoice.line,name:"
msgid "Purchase - Invoice Line"
@@ -87,3 +85,15 @@ msgstr "Compras - Línea de Factura"
msgctxt "model:purchase.purchase-ignored-account.invoice.line,name:"
msgid "Purchase - Ignored Invoice Line"
msgstr "Compras - Línea de Factura ignorada"
+
+msgctxt "view:account.invoice.line:"
+msgid "Invoice Lines"
+msgstr "Líneas de Factura"
+
+msgctxt "wizard_button:purchase.handle.invoice.exception,ask,end:"
+msgid "Cancel"
+msgstr "Cancelar"
+
+msgctxt "wizard_button:purchase.handle.invoice.exception,ask,handle:"
+msgid "Ok"
+msgstr "Aceptar"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 70d63e6..477ce20 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -85,3 +85,18 @@ msgstr "Compra - Línea de factura"
msgctxt "model:purchase.purchase-ignored-account.invoice.line,name:"
msgid "Purchase - Ignored Invoice Line"
msgstr "Compra - Línea de factura ignorada"
+
+#, fuzzy
+msgctxt "view:account.invoice.line:"
+msgid "Invoice Lines"
+msgstr "Líneas de factura"
+
+#, fuzzy
+msgctxt "wizard_button:purchase.handle.invoice.exception,ask,end:"
+msgid "Cancel"
+msgstr "Cancelar"
+
+#, fuzzy
+msgctxt "wizard_button:purchase.handle.invoice.exception,ask,handle:"
+msgid "Ok"
+msgstr "Aceptar"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 0e21b59..6f2d290 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -91,3 +91,17 @@ msgstr "Achat - Ligne de facture"
msgctxt "model:purchase.purchase-ignored-account.invoice.line,name:"
msgid "Purchase - Ignored Invoice Line"
msgstr "Achat - Ligne de facture ignorée"
+
+msgctxt "view:account.invoice.line:"
+msgid "Invoice Lines"
+msgstr "Lignes de factures"
+
+#, fuzzy
+msgctxt "wizard_button:purchase.handle.invoice.exception,ask,end:"
+msgid "Cancel"
+msgstr "Annulé"
+
+#, fuzzy
+msgctxt "wizard_button:purchase.handle.invoice.exception,ask,handle:"
+msgid "Ok"
+msgstr "Ok"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index cc56019..6de0569 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -90,3 +90,18 @@ msgstr ""
msgctxt "model:purchase.purchase-ignored-account.invoice.line,name:"
msgid "Purchase - Ignored Invoice Line"
msgstr ""
+
+#, fuzzy
+msgctxt "view:account.invoice.line:"
+msgid "Invoice Lines"
+msgstr "Factuurregels"
+
+#, fuzzy
+msgctxt "wizard_button:purchase.handle.invoice.exception,ask,end:"
+msgid "Cancel"
+msgstr "Annuleren"
+
+#, fuzzy
+msgctxt "wizard_button:purchase.handle.invoice.exception,ask,handle:"
+msgid "Ok"
+msgstr "Oké"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index f462e8e..17a02db 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -87,3 +87,17 @@ msgstr ""
msgctxt "model:purchase.purchase-ignored-account.invoice.line,name:"
msgid "Purchase - Ignored Invoice Line"
msgstr ""
+
+msgctxt "view:account.invoice.line:"
+msgid "Invoice Lines"
+msgstr ""
+
+#, fuzzy
+msgctxt "wizard_button:purchase.handle.invoice.exception,ask,end:"
+msgid "Cancel"
+msgstr "Отменить"
+
+#, fuzzy
+msgctxt "wizard_button:purchase.handle.invoice.exception,ask,handle:"
+msgid "Ok"
+msgstr "Да"
diff --git a/purchase.py b/purchase.py
index faa2e96..d98e64a 100644
--- a/purchase.py
+++ b/purchase.py
@@ -1,20 +1,24 @@
#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 ModelView, ModelSQL, fields
+from trytond.model import ModelSQL, fields
from trytond.transaction import Transaction
-from trytond.pool import Pool
+from trytond.pool import Pool, PoolMeta
+__all__ = ['Purchase', 'PurchaseInvoiceLine', 'PurchaseIgnoredInvoiceLine',
+ 'HandleInvoiceException']
+__metaclass__ = PoolMeta
-class Purchase(ModelSQL, ModelView):
- _name = 'purchase.purchase'
+class Purchase:
+ __name__ = 'purchase.purchase'
invoice_lines = fields.Many2Many('purchase.purchase-account.invoice.line',
'purchase', 'line', 'Invoice Lines', readonly=True)
invoice_lines_ignored = fields.Many2Many(
'purchase.purchase-ignored-account.invoice.line',
'purchase', 'invoice', 'Invoice Lines Ignored', readonly=True)
- def init(self, module_name):
+ @classmethod
+ def __register__(cls, module_name):
cursor = Transaction().cursor
# Migration from 1.2: packing renamed into shipment
cursor.execute("UPDATE ir_model_data "\
@@ -22,40 +26,39 @@ class Purchase(ModelSQL, ModelView):
"WHERE fs_id like '%%packing%%' "\
"AND module = %s", (module_name,))
- super(Purchase, self).init(module_name)
+ super(Purchase, cls).__register__(module_name)
- def create_invoice(self, purchase):
- invoice_obj = Pool().get('account.invoice')
- invoice_line_obj = Pool().get('account.invoice.line')
+ def create_invoice(self, invoice_type):
+ pool = Pool()
+ Invoice = pool.get('account.invoice')
+ InvoiceLine = pool.get('account.invoice.line')
- invoice_id = super(Purchase, self).create_invoice(purchase)
+ invoice = super(Purchase, self).create_invoice(invoice_type)
- if invoice_id:
- invoice = invoice_obj.browse(invoice_id)
- line_ids = [x.id for x in invoice.lines]
+ if invoice:
+ invoice_line_ids = [l.id for l in invoice.lines]
with Transaction().set_user(0, set_context=True):
- invoice_line_obj.write(line_ids, {
+ InvoiceLine.write(invoice.lines, {
'invoice': None,
'invoice_type': invoice.type,
'party': invoice.party,
'currency': invoice.currency.id,
'company': invoice.company.id,
})
- self.write(purchase.id, {
- 'invoices': [('unlink', invoice_id)],
- 'invoice_lines': [('add', line_ids)],
+ self.write([self], {
+ 'invoices': [('unlink', [invoice.id])],
+ 'invoice_lines': [('add', invoice_line_ids)],
})
with Transaction().set_user(0, set_context=True):
- invoice_obj.cancel([invoice_id])
- invoice_obj.delete(invoice_id)
+ Invoice.cancel([invoice])
+ Invoice.delete([invoice])
return None
- return invoice_id
+ return invoice
- def get_invoice_state(self, purchase):
- state = super(Purchase, self).get_invoice_state(purchase)
- skip_ids = set(x.id for x in purchase.invoice_lines_ignored)
- invoice_lines = [l for l in purchase.invoice_lines
- if l.id not in skip_ids]
+ def get_invoice_state(self):
+ state = super(Purchase, self).get_invoice_state()
+ skips = set(x.id for x in self.invoice_lines_ignored)
+ invoice_lines = [l for l in self.invoice_lines if l.id not in skips]
if invoice_lines:
if any(l.invoice and l.invoice.state == 'cancel'
for l in invoice_lines):
@@ -66,52 +69,53 @@ class Purchase(ModelSQL, ModelView):
return 'paid'
return state
- def copy(self, ids, default=None):
+ @classmethod
+ def copy(cls, purchases, default=None):
if default is None:
default = {}
default = default.copy()
default['invoice_lines'] = None
default['invoice_lines_ignored'] = None
- return super(Purchase, self).copy(ids, default=default)
-
- def ignore_invoice_exception(self, purchase_id):
- super(Purchase, self).ignore_invoice_exception(purchase_id)
- purchase = self.browse(purchase_id)
- invoice_line_ids = []
- for invoice_line in purchase.invoice_lines:
- if invoice_line.invoice \
- and invoice_line.invoice.state == 'cancel':
- invoice_line_ids.append(invoice_line.id)
- if invoice_line_ids:
- self.write(purchase_id, {
- 'invoice_lines_ignored': [
- ('add', x) for x in invoice_line_ids],
- })
-
-Purchase()
+ return super(Purchase, cls).copy(purchases, default=default)
class PurchaseInvoiceLine(ModelSQL):
'Purchase - Invoice Line'
- _name = 'purchase.purchase-account.invoice.line'
+ __name__ = 'purchase.purchase-account.invoice.line'
_table = 'purchase_invoice_line_rel'
- _description = __doc__
purchase = fields.Many2One('purchase.purchase', 'Purchase',
ondelete='CASCADE', select=True, required=True)
line = fields.Many2One('account.invoice.line', 'Invoice Line',
ondelete='RESTRICT', select=True, required=True)
-PurchaseInvoiceLine()
-
class PurchaseIgnoredInvoiceLine(ModelSQL):
'Purchase - Ignored Invoice Line'
- _name = 'purchase.purchase-ignored-account.invoice.line'
+ __name__ = 'purchase.purchase-ignored-account.invoice.line'
_table = 'purchase_invoice_line_ignored_rel'
- _description = __doc__
purchase = fields.Many2One('purchase.purchase', 'Purchase',
ondelete='CASCADE', select=True, required=True)
invoice = fields.Many2One('account.invoice.line', 'Invoice Line',
ondelete='RESTRICT', select=True, required=True)
-PurchaseIgnoredInvoiceLine()
+
+class HandleInvoiceException:
+ __name__ = 'purchase.handle.invoice.exception'
+
+ def transition_handle(self):
+ Purchase = Pool().get('purchase.purchase')
+
+ state = super(HandleInvoiceException, self).transition_handle()
+
+ purchase = Purchase(Transaction().context['active_id'])
+ invoice_lines = []
+ for invoice_line in purchase.invoice_lines:
+ if (invoice_line.invoice
+ and invoice_line.invoice.state == 'cancel'):
+ invoice_lines.append(invoice_line.id)
+ if invoice_lines:
+ Purchase.write([purchase], {
+ 'invoice_lines_ignored': [('add', invoice_lines)],
+ })
+ Purchase.process([purchase])
+ return state
diff --git a/purchase.xml b/purchase.xml
index 92ce483..a7a757d 100644
--- a/purchase.xml
+++ b/purchase.xml
@@ -3,6 +3,30 @@
this repository contains the full copyright notices and license terms. -->
<tryton>
<data>
+ <record model="ir.ui.view" id="invoice_line_invoice_type">
+ <field name="model">account.invoice.line</field>
+ <field name="type">tree</field>
+ <field name="priority" eval="30"/>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <tree string="Invoice Lines">
+ <field name="invoice"/>
+ <field name="invoice_type"/>
+ <field name="type"/>
+ <field name="product"/>
+ <field name="account"/>
+ <field name="description"/>
+ <field name="quantity"/>
+ <field name="unit"/>
+ <field name="unit_price"/>
+ <field name="taxes"/>
+ <field name="amount"/>
+ <field name="unit_digits" tree_invisible="1"/>
+ <field name="currency_digits" tree_invisible="1"/>
+ </tree>
+ ]]>
+ </field>
+ </record>
<record model="ir.ui.view" id="purchase_view_form">
<field name="model">purchase.purchase</field>
<field name="inherit" ref="purchase.purchase_view_form"/>
@@ -12,7 +36,7 @@ this repository contains the full copyright notices and license terms. -->
<xpath
expr="/form/notebook/page/field[@name="invoices"]"
position="after">
- <field name="invoice_lines" colspan="4"/>
+ <field name="invoice_lines" colspan="4" view_ids="purchase_invoice_line_standalone.invoice_line_invoice_type"/>
</xpath>
</data>
]]>
diff --git a/setup.py b/setup.py
index 7a9b4c2..b76f831 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_purchase_invoice_line_standalone',
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 for standalone invoice line from purchase',
+ 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.purchase_invoice_line_standalone': '.'},
packages=[
'trytond.modules.purchase_invoice_line_standalone',
'trytond.modules.purchase_invoice_line_standalone.tests',
- ],
+ ],
package_data={
- 'trytond.modules.purchase_invoice_line_standalone': info.get('xml', []) \
- + info.get('translation', []),
- },
+ 'trytond.modules.purchase_invoice_line_standalone': \
+ info.get('xml', []) + ['tryton.cfg', 'locale/*.po'],
+ },
classifiers=[
'Development Status :: 5 - Production/Stable',
'Environment :: Plugins',
@@ -56,14 +67,15 @@ setup(name='trytond_purchase_invoice_line_standalone',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Topic :: Office/Business',
- ],
+ ],
license='GPL-3',
install_requires=requires,
zip_safe=False,
entry_points="""
[trytond.modules]
- purchase_invoice_line_standalone = trytond.modules.purchase_invoice_line_standalone
+ purchase_invoice_line_standalone = \
+ trytond.modules.purchase_invoice_line_standalone
""",
test_suite='tests',
test_loader='trytond.test_loader:Loader',
-)
+ )
diff --git a/tests/test_purchase_invoice_line_standalone.py b/tests/test_purchase_invoice_line_standalone.py
index 0ff5900..2bc0757 100644
--- a/tests/test_purchase_invoice_line_standalone.py
+++ b/tests/test_purchase_invoice_line_standalone.py
@@ -10,8 +10,10 @@ if os.path.isdir(DIR):
sys.path.insert(0, os.path.dirname(DIR))
import unittest
+import doctest
import trytond.tests.test_tryton
from trytond.tests.test_tryton import test_view, test_depends
+from trytond.backend.sqlite.database import Database as SQLiteDatabase
class PurchaseInvoiceLineStandaloneTestCase(unittest.TestCase):
@@ -36,10 +38,24 @@ class PurchaseInvoiceLineStandaloneTestCase(unittest.TestCase):
test_depends()
+def doctest_dropdb(test):
+ database = SQLiteDatabase().connect()
+ cursor = database.cursor(autocommit=True)
+ try:
+ database.drop(cursor, ':memory:')
+ cursor.commit()
+ finally:
+ cursor.close()
+
+
def suite():
suite = trytond.tests.test_tryton.suite()
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
PurchaseInvoiceLineStandaloneTestCase))
+ suite.addTests(doctest.DocFileSuite(
+ 'scenario_purchase_invoice_line_standalone.rst',
+ setUp=doctest_dropdb, tearDown=doctest_dropdb, encoding='UTF-8',
+ optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
return suite
if __name__ == '__main__':
diff --git a/tryton.cfg b/tryton.cfg
new file mode 100644
index 0000000..530149f
--- /dev/null
+++ b/tryton.cfg
@@ -0,0 +1,8 @@
+[tryton]
+version=2.6.0
+depends:
+ account_invoice_line_standalone
+ ir
+ purchase
+xml:
+ purchase.xml
diff --git a/trytond_purchase_invoice_line_standalone.egg-info/PKG-INFO b/trytond_purchase_invoice_line_standalone.egg-info/PKG-INFO
index b8c7cce..e32396e 100644
--- a/trytond_purchase_invoice_line_standalone.egg-info/PKG-INFO
+++ b/trytond_purchase_invoice_line_standalone.egg-info/PKG-INFO
@@ -1,17 +1,48 @@
Metadata-Version: 1.0
Name: trytond-purchase-invoice-line-standalone
-Version: 2.4.0
-Summary:
-Change the purchase order behaviour to create standalone invoice lines instead of a
-complete invoice. This allow to compose invoices with lines originating
-from differents purchases.
-
+Version: 2.6.0
+Summary: Tryton module for standalone invoice line from purchase
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_purchase_invoice_line_standalone
+ =======================================
+
+ The account_purchase_line_standalone 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_purchase_invoice_line_standalone.egg-info/SOURCES.txt b/trytond_purchase_invoice_line_standalone.egg-info/SOURCES.txt
index e82a1a0..a97e231 100644
--- a/trytond_purchase_invoice_line_standalone.egg-info/SOURCES.txt
+++ b/trytond_purchase_invoice_line_standalone.egg-info/SOURCES.txt
@@ -6,8 +6,8 @@ MANIFEST.in
README
purchase.xml
setup.py
+tryton.cfg
./__init__.py
-./__tryton__.py
./invoice.py
./purchase.py
./tests/__init__.py
diff --git a/trytond_purchase_invoice_line_standalone.egg-info/entry_points.txt b/trytond_purchase_invoice_line_standalone.egg-info/entry_points.txt
index 4004974..68c328a 100644
--- a/trytond_purchase_invoice_line_standalone.egg-info/entry_points.txt
+++ b/trytond_purchase_invoice_line_standalone.egg-info/entry_points.txt
@@ -1,4 +1,4 @@
[trytond.modules]
- purchase_invoice_line_standalone = trytond.modules.purchase_invoice_line_standalone
+ purchase_invoice_line_standalone = trytond.modules.purchase_invoice_line_standalone
\ No newline at end of file
diff --git a/trytond_purchase_invoice_line_standalone.egg-info/requires.txt b/trytond_purchase_invoice_line_standalone.egg-info/requires.txt
index 75d6cfe..a5c541b 100644
--- a/trytond_purchase_invoice_line_standalone.egg-info/requires.txt
+++ b/trytond_purchase_invoice_line_standalone.egg-info/requires.txt
@@ -1,3 +1,3 @@
-trytond_purchase >= 2.4, < 2.5
-trytond_account_invoice_line_standalone >= 2.4, < 2.5
-trytond >= 2.4, < 2.5
\ No newline at end of file
+trytond_account_invoice_line_standalone >= 2.6, < 2.7
+trytond_purchase >= 2.6, < 2.7
+trytond >= 2.6, < 2.7
\ No newline at end of file
commit e212a653bc3bd627174aec51bbe4a3e44751f965
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 24 19:31:02 2012 +0200
Adding upstream version 2.4.0.
diff --git a/CHANGELOG b/CHANGELOG
index 80fd666..d1d055c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.4.0 - 2012-04-24
+* Bug fixes (see mercurial logs for details)
+
Version 2.2.0 - 2011-10-25
* 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 5ebab97..15e0b5b 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_purchase_invoice_line_standalone
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_purchase (http://www.tryton.org/)
* trytond_account_invoice_line_standalone (http://www.tryton.org/)
diff --git a/PKG-INFO b/PKG-INFO
index ae2131f..3dd8580 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_purchase_invoice_line_standalone
-Version: 2.2.0
+Version: 2.4.0
Summary:
Change the purchase order behaviour to create standalone invoice lines instead of a
complete invoice. This allow to compose invoices with lines originating
@@ -10,7 +10,7 @@ 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 907d04b..5a01bfc 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.
-from purchase import *
-from invoice import *
+from .purchase import *
+from .invoice import *
diff --git a/__tryton__.py b/__tryton__.py
index 6f1521a..96b0fe6 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -1,14 +1,16 @@
#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" : "Purchase Invoice Line Standalone",
- "name_bg_BG" : "Ред от независима фактура към покупка",
- "name_de_DE" : "Einkauf ungebundene Rechnungsposition",
- "name_es_CO" : "Línea de Factura autónoma en Compras",
- "name_es_ES" : "Línea de factura de compra independiente",
- "name_fr_FR" : "Ligne de facture autonome - Achat",
- "version" : "2.2.0",
- "author" : "B2CK",
+ "name": "Purchase Invoice Line Standalone",
+ "name_bg_BG": "Ред от независима фактура към покупка",
+ 'name_ca_ES': 'Línia de factura de compra independent',
+ "name_de_DE": "Einkauf ungebundene Rechnungsposition",
+ "name_es_AR": "Línea de factura de compra independiente",
+ "name_es_CO": "Línea de Factura autónoma en Compras",
+ "name_es_ES": "Línea de factura de compra independiente",
+ "name_fr_FR": "Ligne de facture autonome - Achat",
+ "version": "2.4.0",
+ "author": "B2CK",
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
"description": '''
@@ -21,37 +23,47 @@ from differents purchases.
създава редове с независими фактури.
- Позволява създаване на фактури с редове от различни покупки.
''',
+ 'description_ca_ES': '''Modifica el comportament de les comandes de compra
+perquè crei línies de factura enlloc d'una factura completa. Això permet crear
+factures amb línies provinents de diferents compres.
+''',
"description_de_DE": '''Einkäufe mit ungebundenen Rechnungspositionen
- Ändert das Verhalten im Einkaufsvorgang, indem unabhängige Rechnungspositionen
an Stelle einer kompletten Rechnung erstellt werden.
- Ermöglicht die Zusammenstellung von Rechnungen aus Einkaufspositionen
verschiedener Einkäufe.
''',
+ "description_es_AR": '''
+Modifica el comportamiento de la orden de compra permitiendo crear líneas
+independientes en lugar de una factura completa. Esto permite componer
+facturas con líneas originadas en diferentes compras.
+''',
"description_es_CO": '''Modifica el comportamiento de orden de compra permitiendo crear
líneas autónomas en lugar de una factura completa. Permite componer facturas con
líneas originadas en diferentes compras.
''',
- "description_es_ES": '''
-Modifica el comportamiento de orden de compra permitiendo crear líneas
-independientes en lugar de una factura completa. Esto permite componer
-facturas con líneas originadas en diferentes compras.
+ "description_es_ES": '''Modifica el comportamiento de los pedidos de compra permitiendo crear
+líneas de factura independientes en lugar de una factura completa. Esto permite crear
+facturas con líneas que procedan de distintas compras.
''',
"description_fr_FR": '''Modifie le comportement de l'ordre d'achat pour créer des lignes de
facture autonomes au lieu de factures complètes. Cela permet de
composer des factures avec des lignes provenant de différents achats.
''',
- "depends" : [
+ "depends": [
"ir",
"purchase",
"account_invoice_line_standalone",
],
- "xml" : [
+ "xml": [
"purchase.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',
diff --git a/invoice.py b/invoice.py
index 6a6c287..e8ee3ad 100644
--- a/invoice.py
+++ b/invoice.py
@@ -1,31 +1,10 @@
#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 ModelView, ModelSQL, fields
+from trytond.model import ModelView, ModelSQL
from trytond.transaction import Transaction
from trytond.pool import Pool
-class Invoice(ModelSQL, ModelView):
- _name = 'account.invoice'
-
- def write(self, ids, vals):
- invoice_line_obj = Pool().get('account.invoice.line')
- purchase_obj = Pool().get('purchase.purchase')
- res = super(Invoice, self).write(ids, vals)
- if 'state' in vals and vals['state'] in ('paid', 'cancel'):
- if isinstance(ids, (int, long)):
- ids = [ids]
- purchase_ids = purchase_obj.search([
- ('invoices', 'in', ids),
- ])
- for purchase in purchase_obj.browse(purchase_ids):
- invoice_line_obj.workflow_trigger_trigger(
- [x.id for x in purchase.invoice_lines])
- return res
-
-Invoice()
-
-
class InvoiceLine(ModelSQL, ModelView):
_name = 'account.invoice.line'
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 020d9af..a28842f 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -2,46 +2,86 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:account.invoice.line:0"
+msgctxt "error:account.invoice.line:"
msgid "You can not delete invoice lines that comes from a purchase!"
msgstr "Не може да изтривате редове от фактура която идва от покупка!"
-msgctxt "field:purchase.purchase,invoice_lines:0"
+msgctxt "field:purchase.purchase,invoice_lines:"
msgid "Invoice Lines"
msgstr "Редове от фактура"
-msgctxt "field:purchase.purchase,invoice_lines_ignored:0"
+msgctxt "field:purchase.purchase,invoice_lines_ignored:"
msgid "Invoice Lines Ignored"
msgstr "Игнорирани редове от фактура"
-msgctxt "field:purchase.purchase-account.invoice.line,line:0"
+msgctxt "field:purchase.purchase-account.invoice.line,create_date:"
+msgid "Create Date"
+msgstr "Създадено на"
+
+msgctxt "field:purchase.purchase-account.invoice.line,create_uid:"
+msgid "Create User"
+msgstr "Създадено от"
+
+msgctxt "field:purchase.purchase-account.invoice.line,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:purchase.purchase-account.invoice.line,line:"
msgid "Invoice Line"
msgstr "Ред от фактура"
-msgctxt "field:purchase.purchase-account.invoice.line,purchase:0"
+msgctxt "field:purchase.purchase-account.invoice.line,purchase:"
msgid "Purchase"
msgstr "Покупки"
-msgctxt "field:purchase.purchase-account.invoice.line,rec_name:0"
+msgctxt "field:purchase.purchase-account.invoice.line,rec_name:"
msgid "Name"
msgstr "Име"
-msgctxt "field:purchase.purchase-ignored-account.invoice.line,invoice:0"
+msgctxt "field:purchase.purchase-account.invoice.line,write_date:"
+msgid "Write Date"
+msgstr "Променено на"
+
+msgctxt "field:purchase.purchase-account.invoice.line,write_uid:"
+msgid "Write User"
+msgstr "Променено от"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,create_date:"
+msgid "Create Date"
+msgstr "Създадено на"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,create_uid:"
+msgid "Create User"
+msgstr "Създадено от"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,invoice:"
msgid "Invoice Line"
msgstr "Ред от фактура"
-msgctxt "field:purchase.purchase-ignored-account.invoice.line,purchase:0"
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,purchase:"
msgid "Purchase"
msgstr "Покупки"
-msgctxt "field:purchase.purchase-ignored-account.invoice.line,rec_name:0"
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,rec_name:"
msgid "Name"
msgstr "Име"
-msgctxt "model:purchase.purchase-account.invoice.line,name:0"
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,write_date:"
+msgid "Write Date"
+msgstr "Променено на"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,write_uid:"
+msgid "Write User"
+msgstr "Променено от"
+
+msgctxt "model:purchase.purchase-account.invoice.line,name:"
msgid "Purchase - Invoice Line"
msgstr "Покупка - Ред от фактура"
-msgctxt "model:purchase.purchase-ignored-account.invoice.line,name:0"
+msgctxt "model:purchase.purchase-ignored-account.invoice.line,name:"
msgid "Purchase - Ignored Invoice Line"
msgstr "Покупка - Игнорирани редове от фактура"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
new file mode 100644
index 0000000..f44d108
--- /dev/null
+++ b/locale/ca_ES.po
@@ -0,0 +1,89 @@
+#
+msgid ""
+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 "No pot esborrar línies que vénen d'una compra"
+
+msgctxt "field:purchase.purchase,invoice_lines:"
+msgid "Invoice Lines"
+msgstr "Línies de factura"
+
+msgctxt "field:purchase.purchase,invoice_lines_ignored:"
+msgid "Invoice Lines Ignored"
+msgstr "Línies de factura ignorades"
+
+msgctxt "field:purchase.purchase-account.invoice.line,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:purchase.purchase-account.invoice.line,create_uid:"
+msgid "Create User"
+msgstr "Crear usuari"
+
+msgctxt "field:purchase.purchase-account.invoice.line,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:purchase.purchase-account.invoice.line,line:"
+msgid "Invoice Line"
+msgstr "Línia de factura"
+
+msgctxt "field:purchase.purchase-account.invoice.line,purchase:"
+msgid "Purchase"
+msgstr "Compra"
+
+msgctxt "field:purchase.purchase-account.invoice.line,rec_name:"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:purchase.purchase-account.invoice.line,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:purchase.purchase-account.invoice.line,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,create_uid:"
+msgid "Create User"
+msgstr "Crear usuari"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,invoice:"
+msgid "Invoice Line"
+msgstr "Línia de factura"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,purchase:"
+msgid "Purchase"
+msgstr "Compra"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,rec_name:"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "model:purchase.purchase-account.invoice.line,name:"
+msgid "Purchase - Invoice Line"
+msgstr "Compra - Línia de factura"
+
+msgctxt "model:purchase.purchase-ignored-account.invoice.line,name:"
+msgid "Purchase - Ignored Invoice Line"
+msgstr "Compra - Línia de factura ignorada"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index fd8554d..69dc354 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -2,46 +2,86 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:account.invoice.line:0"
+msgctxt "error:account.invoice.line:"
msgid "You can not delete invoice lines that comes from a purchase!"
msgstr ""
-msgctxt "field:purchase.purchase,invoice_lines:0"
+msgctxt "field:purchase.purchase,invoice_lines:"
msgid "Invoice Lines"
msgstr ""
-msgctxt "field:purchase.purchase,invoice_lines_ignored:0"
+msgctxt "field:purchase.purchase,invoice_lines_ignored:"
msgid "Invoice Lines Ignored"
msgstr ""
-msgctxt "field:purchase.purchase-account.invoice.line,line:0"
+msgctxt "field:purchase.purchase-account.invoice.line,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:purchase.purchase-account.invoice.line,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:purchase.purchase-account.invoice.line,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:purchase.purchase-account.invoice.line,line:"
msgid "Invoice Line"
msgstr ""
-msgctxt "field:purchase.purchase-account.invoice.line,purchase:0"
+msgctxt "field:purchase.purchase-account.invoice.line,purchase:"
msgid "Purchase"
msgstr ""
-msgctxt "field:purchase.purchase-account.invoice.line,rec_name:0"
+msgctxt "field:purchase.purchase-account.invoice.line,rec_name:"
msgid "Name"
msgstr ""
-msgctxt "field:purchase.purchase-ignored-account.invoice.line,invoice:0"
+msgctxt "field:purchase.purchase-account.invoice.line,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:purchase.purchase-account.invoice.line,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,invoice:"
msgid "Invoice Line"
msgstr ""
-msgctxt "field:purchase.purchase-ignored-account.invoice.line,purchase:0"
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,purchase:"
msgid "Purchase"
msgstr ""
-msgctxt "field:purchase.purchase-ignored-account.invoice.line,rec_name:0"
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,rec_name:"
msgid "Name"
msgstr ""
-msgctxt "model:purchase.purchase-account.invoice.line,name:0"
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "model:purchase.purchase-account.invoice.line,name:"
msgid "Purchase - Invoice Line"
msgstr ""
-msgctxt "model:purchase.purchase-ignored-account.invoice.line,name:0"
+msgctxt "model:purchase.purchase-ignored-account.invoice.line,name:"
msgid "Purchase - Ignored Invoice Line"
msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 6ab5ea1..56fd946 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -2,48 +2,88 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:account.invoice.line:0"
+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!"
-msgctxt "field:purchase.purchase,invoice_lines:0"
+msgctxt "field:purchase.purchase,invoice_lines:"
msgid "Invoice Lines"
msgstr "Rechnungspositionen Kunden"
-msgctxt "field:purchase.purchase,invoice_lines_ignored:0"
+msgctxt "field:purchase.purchase,invoice_lines_ignored:"
msgid "Invoice Lines Ignored"
msgstr "Ignorierte Rechnungspositionen"
-msgctxt "field:purchase.purchase-account.invoice.line,line:0"
+msgctxt "field:purchase.purchase-account.invoice.line,create_date:"
+msgid "Create Date"
+msgstr "Erstellungsdatum"
+
+msgctxt "field:purchase.purchase-account.invoice.line,create_uid:"
+msgid "Create User"
+msgstr "Erstellt durch"
+
+msgctxt "field:purchase.purchase-account.invoice.line,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:purchase.purchase-account.invoice.line,line:"
msgid "Invoice Line"
msgstr "Rechnungsposition Kunde"
-msgctxt "field:purchase.purchase-account.invoice.line,purchase:0"
+msgctxt "field:purchase.purchase-account.invoice.line,purchase:"
msgid "Purchase"
msgstr "Einkauf"
-msgctxt "field:purchase.purchase-account.invoice.line,rec_name:0"
+msgctxt "field:purchase.purchase-account.invoice.line,rec_name:"
msgid "Name"
msgstr "Name"
-msgctxt "field:purchase.purchase-ignored-account.invoice.line,invoice:0"
+msgctxt "field:purchase.purchase-account.invoice.line,write_date:"
+msgid "Write Date"
+msgstr "Zuletzt geändert"
+
+msgctxt "field:purchase.purchase-account.invoice.line,write_uid:"
+msgid "Write User"
+msgstr "Letzte Änderung durch"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,create_date:"
+msgid "Create Date"
+msgstr "Erstellungsdatum"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,create_uid:"
+msgid "Create User"
+msgstr "Erstellt durch"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,invoice:"
msgid "Invoice Line"
msgstr "Rechnungsposition Kunde"
-msgctxt "field:purchase.purchase-ignored-account.invoice.line,purchase:0"
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,purchase:"
msgid "Purchase"
msgstr "Einkauf"
-msgctxt "field:purchase.purchase-ignored-account.invoice.line,rec_name:0"
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,rec_name:"
msgid "Name"
msgstr "Name"
-msgctxt "model:purchase.purchase-account.invoice.line,name:0"
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,write_date:"
+msgid "Write Date"
+msgstr "Zuletzt geändert"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,write_uid:"
+msgid "Write User"
+msgstr "Letzte Änderung durch"
+
+msgctxt "model:purchase.purchase-account.invoice.line,name:"
msgid "Purchase - Invoice Line"
msgstr "Einkauf - Rechnungsposition"
-msgctxt "model:purchase.purchase-ignored-account.invoice.line,name:0"
+msgctxt "model:purchase.purchase-ignored-account.invoice.line,name:"
msgid "Purchase - Ignored Invoice Line"
msgstr "Einkauf - Ignorierte Rechnungsposition"
diff --git a/locale/es_AR.po b/locale/es_AR.po
new file mode 100644
index 0000000..82c85b2
--- /dev/null
+++ b/locale/es_AR.po
@@ -0,0 +1,87 @@
+#
+msgid ""
+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 "¡No puede borrar líneas que vienen de una compra!"
+
+msgctxt "field:purchase.purchase,invoice_lines:"
+msgid "Invoice Lines"
+msgstr "Líneas de factura"
+
+msgctxt "field:purchase.purchase,invoice_lines_ignored:"
+msgid "Invoice Lines Ignored"
+msgstr "Líneas de factura ignoradas"
+
+msgctxt "field:purchase.purchase-account.invoice.line,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:purchase.purchase-account.invoice.line,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:purchase.purchase-account.invoice.line,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:purchase.purchase-account.invoice.line,line:"
+msgid "Invoice Line"
+msgstr "Línea de factura"
+
+msgctxt "field:purchase.purchase-account.invoice.line,purchase:"
+msgid "Purchase"
+msgstr "Compra"
+
+msgctxt "field:purchase.purchase-account.invoice.line,rec_name:"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:purchase.purchase-account.invoice.line,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:purchase.purchase-account.invoice.line,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,invoice:"
+msgid "Invoice Line"
+msgstr "Línea de factura"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,purchase:"
+msgid "Purchase"
+msgstr "Compra"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,rec_name:"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "model:purchase.purchase-account.invoice.line,name:"
+msgid "Purchase - Invoice Line"
+msgstr "Compra - Línea de factura"
+
+msgctxt "model:purchase.purchase-ignored-account.invoice.line,name:"
+msgid "Purchase - Ignored Invoice Line"
+msgstr "Compra - Línea de factura ignorada"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 444a18c..a14fc60 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -2,46 +2,88 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:account.invoice.line:0"
+msgctxt "error:account.invoice.line:"
msgid "You can not delete invoice lines that comes from a purchase!"
msgstr "¡No puede eliminar líneas que vienen de una compra!"
-msgctxt "field:purchase.purchase,invoice_lines:0"
+msgctxt "field:purchase.purchase,invoice_lines:"
msgid "Invoice Lines"
msgstr "Líneas de Factura"
-msgctxt "field:purchase.purchase,invoice_lines_ignored:0"
+msgctxt "field:purchase.purchase,invoice_lines_ignored:"
msgid "Invoice Lines Ignored"
msgstr "Líneas de Factura ignoradas"
-msgctxt "field:purchase.purchase-account.invoice.line,line:0"
+msgctxt "field:purchase.purchase-account.invoice.line,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:purchase.purchase-account.invoice.line,create_uid:"
+msgid "Create User"
+msgstr "Crear usuario"
+
+msgctxt "field:purchase.purchase-account.invoice.line,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:purchase.purchase-account.invoice.line,line:"
msgid "Invoice Line"
msgstr "Línea de Factura"
-msgctxt "field:purchase.purchase-account.invoice.line,purchase:0"
+msgctxt "field:purchase.purchase-account.invoice.line,purchase:"
msgid "Purchase"
msgstr "Compras"
-msgctxt "field:purchase.purchase-account.invoice.line,rec_name:0"
+msgctxt "field:purchase.purchase-account.invoice.line,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:purchase.purchase-ignored-account.invoice.line,invoice:0"
+msgctxt "field:purchase.purchase-account.invoice.line,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:purchase.purchase-account.invoice.line,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,create_date:"
+msgid "Create Date"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,create_uid:"
+msgid "Create User"
+msgstr "Crear usuario"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,invoice:"
msgid "Invoice Line"
msgstr "Línea de Factura"
-msgctxt "field:purchase.purchase-ignored-account.invoice.line,purchase:0"
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,purchase:"
msgid "Purchase"
msgstr "Compras"
-msgctxt "field:purchase.purchase-ignored-account.invoice.line,rec_name:0"
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "model:purchase.purchase-account.invoice.line,name:0"
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "model:purchase.purchase-account.invoice.line,name:"
msgid "Purchase - Invoice Line"
msgstr "Compras - Línea de Factura"
-msgctxt "model:purchase.purchase-ignored-account.invoice.line,name:0"
+msgctxt "model:purchase.purchase-ignored-account.invoice.line,name:"
msgid "Purchase - Ignored Invoice Line"
msgstr "Compras - Línea de Factura ignorada"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 07f2009..70d63e6 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -2,46 +2,86 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:account.invoice.line:0"
+msgctxt "error:account.invoice.line:"
msgid "You can not delete invoice lines that comes from a purchase!"
-msgstr "No puede borrar líneas que vienen de una compra"
+msgstr "No puede eliminar líneas que vienen de una compra."
-msgctxt "field:purchase.purchase,invoice_lines:0"
+msgctxt "field:purchase.purchase,invoice_lines:"
msgid "Invoice Lines"
msgstr "Líneas de factura"
-msgctxt "field:purchase.purchase,invoice_lines_ignored:0"
+msgctxt "field:purchase.purchase,invoice_lines_ignored:"
msgid "Invoice Lines Ignored"
msgstr "Líneas de factura ignoradas"
-msgctxt "field:purchase.purchase-account.invoice.line,line:0"
+msgctxt "field:purchase.purchase-account.invoice.line,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:purchase.purchase-account.invoice.line,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:purchase.purchase-account.invoice.line,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:purchase.purchase-account.invoice.line,line:"
msgid "Invoice Line"
msgstr "Línea de factura"
-msgctxt "field:purchase.purchase-account.invoice.line,purchase:0"
+msgctxt "field:purchase.purchase-account.invoice.line,purchase:"
msgid "Purchase"
msgstr "Compra"
-msgctxt "field:purchase.purchase-account.invoice.line,rec_name:0"
+msgctxt "field:purchase.purchase-account.invoice.line,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:purchase.purchase-ignored-account.invoice.line,invoice:0"
+msgctxt "field:purchase.purchase-account.invoice.line,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:purchase.purchase-account.invoice.line,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,create_date:"
+msgid "Create Date"
+msgstr "Fecha creación"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,create_uid:"
+msgid "Create User"
+msgstr "Usuario creación"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,invoice:"
msgid "Invoice Line"
msgstr "Línea de factura"
-msgctxt "field:purchase.purchase-ignored-account.invoice.line,purchase:0"
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,purchase:"
msgid "Purchase"
msgstr "Compra"
-msgctxt "field:purchase.purchase-ignored-account.invoice.line,rec_name:0"
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "model:purchase.purchase-account.invoice.line,name:0"
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,write_date:"
+msgid "Write Date"
+msgstr "Fecha modificación"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,write_uid:"
+msgid "Write User"
+msgstr "Usuario modificación"
+
+msgctxt "model:purchase.purchase-account.invoice.line,name:"
msgid "Purchase - Invoice Line"
msgstr "Compra - Línea de factura"
-msgctxt "model:purchase.purchase-ignored-account.invoice.line,name:0"
+msgctxt "model:purchase.purchase-ignored-account.invoice.line,name:"
msgid "Purchase - Ignored Invoice Line"
msgstr "Compra - Línea de factura ignorada"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index b50fa8c..0e21b59 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -2,47 +2,92 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:account.invoice.line:0"
+msgctxt "error:account.invoice.line:"
msgid "You can not delete invoice lines that comes from a purchase!"
msgstr ""
"Vous ne pouvez pas supprimer des lignes de facture qui viennent d'un achat !"
-msgctxt "field:purchase.purchase,invoice_lines:0"
+msgctxt "error:account.invoice.line:"
+msgid "You can not delete invoice lines that comes from a purchase!"
+msgstr ""
+"Vous ne pouvez pas supprimer des lignes de facture qui viennent d'un achat !"
+
+msgctxt "field:purchase.purchase,invoice_lines:"
msgid "Invoice Lines"
msgstr "Lignes de facture"
-msgctxt "field:purchase.purchase,invoice_lines_ignored:0"
+msgctxt "field:purchase.purchase,invoice_lines_ignored:"
msgid "Invoice Lines Ignored"
msgstr "Lignes de facture ignorées"
-msgctxt "field:purchase.purchase-account.invoice.line,line:0"
+msgctxt "field:purchase.purchase-account.invoice.line,create_date:"
+msgid "Create Date"
+msgstr "Date de création"
+
+msgctxt "field:purchase.purchase-account.invoice.line,create_uid:"
+msgid "Create User"
+msgstr "Créé par"
+
+msgctxt "field:purchase.purchase-account.invoice.line,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:purchase.purchase-account.invoice.line,line:"
msgid "Invoice Line"
msgstr "Ligne de facture"
-msgctxt "field:purchase.purchase-account.invoice.line,purchase:0"
+msgctxt "field:purchase.purchase-account.invoice.line,purchase:"
msgid "Purchase"
msgstr "Achat"
-msgctxt "field:purchase.purchase-account.invoice.line,rec_name:0"
+msgctxt "field:purchase.purchase-account.invoice.line,rec_name:"
msgid "Name"
msgstr "Nom"
-msgctxt "field:purchase.purchase-ignored-account.invoice.line,invoice:0"
+msgctxt "field:purchase.purchase-account.invoice.line,write_date:"
+msgid "Write Date"
+msgstr "Date de mise à jour"
+
+msgctxt "field:purchase.purchase-account.invoice.line,write_uid:"
+msgid "Write User"
+msgstr "Mis à jour par"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,create_date:"
+msgid "Create Date"
+msgstr "Date de création"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,create_uid:"
+msgid "Create User"
+msgstr "Créé par"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,invoice:"
msgid "Invoice Line"
msgstr "Ligne de facture"
-msgctxt "field:purchase.purchase-ignored-account.invoice.line,purchase:0"
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,purchase:"
msgid "Purchase"
msgstr "Achat"
-msgctxt "field:purchase.purchase-ignored-account.invoice.line,rec_name:0"
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,rec_name:"
msgid "Name"
msgstr "Nom"
-msgctxt "model:purchase.purchase-account.invoice.line,name:0"
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,write_date:"
+msgid "Write Date"
+msgstr "Date de mise à jour"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,write_uid:"
+msgid "Write User"
+msgstr "Mis à jour par"
+
+msgctxt "model:purchase.purchase-account.invoice.line,name:"
msgid "Purchase - Invoice Line"
msgstr "Achat - Ligne de facture"
-msgctxt "model:purchase.purchase-ignored-account.invoice.line,name:0"
+msgctxt "model:purchase.purchase-ignored-account.invoice.line,name:"
msgid "Purchase - Ignored Invoice Line"
msgstr "Achat - Ligne de facture ignorée"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index c334ec5..cc56019 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -2,51 +2,91 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:account.invoice.line:0"
+msgctxt "error:account.invoice.line:"
msgid "You can not delete invoice lines that comes from a purchase!"
msgstr ""
#, fuzzy
-msgctxt "field:purchase.purchase,invoice_lines:0"
+msgctxt "field:purchase.purchase,invoice_lines:"
msgid "Invoice Lines"
msgstr "Factuurregels"
-msgctxt "field:purchase.purchase,invoice_lines_ignored:0"
+msgctxt "field:purchase.purchase,invoice_lines_ignored:"
msgid "Invoice Lines Ignored"
msgstr ""
+msgctxt "field:purchase.purchase-account.invoice.line,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:purchase.purchase-account.invoice.line,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:purchase.purchase-account.invoice.line,id:"
+msgid "ID"
+msgstr ""
+
#, fuzzy
-msgctxt "field:purchase.purchase-account.invoice.line,line:0"
+msgctxt "field:purchase.purchase-account.invoice.line,line:"
msgid "Invoice Line"
msgstr "Factuurregel"
-msgctxt "field:purchase.purchase-account.invoice.line,purchase:0"
+msgctxt "field:purchase.purchase-account.invoice.line,purchase:"
msgid "Purchase"
msgstr ""
#, fuzzy
-msgctxt "field:purchase.purchase-account.invoice.line,rec_name:0"
+msgctxt "field:purchase.purchase-account.invoice.line,rec_name:"
msgid "Name"
msgstr "Naam bijlage"
+msgctxt "field:purchase.purchase-account.invoice.line,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:purchase.purchase-account.invoice.line,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,id:"
+msgid "ID"
+msgstr ""
+
#, fuzzy
-msgctxt "field:purchase.purchase-ignored-account.invoice.line,invoice:0"
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,invoice:"
msgid "Invoice Line"
msgstr "Factuurregel"
-msgctxt "field:purchase.purchase-ignored-account.invoice.line,purchase:0"
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,purchase:"
msgid "Purchase"
msgstr ""
#, fuzzy
-msgctxt "field:purchase.purchase-ignored-account.invoice.line,rec_name:0"
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,rec_name:"
msgid "Name"
msgstr "Naam bijlage"
-msgctxt "model:purchase.purchase-account.invoice.line,name:0"
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "model:purchase.purchase-account.invoice.line,name:"
msgid "Purchase - Invoice Line"
msgstr ""
-msgctxt "model:purchase.purchase-ignored-account.invoice.line,name:0"
+msgctxt "model:purchase.purchase-ignored-account.invoice.line,name:"
msgid "Purchase - Ignored Invoice Line"
msgstr ""
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 288755e..f462e8e 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -2,48 +2,88 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:account.invoice.line:0"
+msgctxt "error:account.invoice.line:"
msgid "You can not delete invoice lines that comes from a purchase!"
msgstr ""
-msgctxt "field:purchase.purchase,invoice_lines:0"
+msgctxt "field:purchase.purchase,invoice_lines:"
msgid "Invoice Lines"
msgstr ""
-msgctxt "field:purchase.purchase,invoice_lines_ignored:0"
+msgctxt "field:purchase.purchase,invoice_lines_ignored:"
msgid "Invoice Lines Ignored"
msgstr ""
-msgctxt "field:purchase.purchase-account.invoice.line,line:0"
+msgctxt "field:purchase.purchase-account.invoice.line,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:purchase.purchase-account.invoice.line,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:purchase.purchase-account.invoice.line,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:purchase.purchase-account.invoice.line,line:"
msgid "Invoice Line"
msgstr ""
-msgctxt "field:purchase.purchase-account.invoice.line,purchase:0"
+msgctxt "field:purchase.purchase-account.invoice.line,purchase:"
msgid "Purchase"
msgstr ""
#, fuzzy
-msgctxt "field:purchase.purchase-account.invoice.line,rec_name:0"
+msgctxt "field:purchase.purchase-account.invoice.line,rec_name:"
msgid "Name"
msgstr "Наименование"
-msgctxt "field:purchase.purchase-ignored-account.invoice.line,invoice:0"
+msgctxt "field:purchase.purchase-account.invoice.line,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:purchase.purchase-account.invoice.line,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,invoice:"
msgid "Invoice Line"
msgstr ""
-msgctxt "field:purchase.purchase-ignored-account.invoice.line,purchase:0"
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,purchase:"
msgid "Purchase"
msgstr ""
#, fuzzy
-msgctxt "field:purchase.purchase-ignored-account.invoice.line,rec_name:0"
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,rec_name:"
msgid "Name"
msgstr "Наименование"
-msgctxt "model:purchase.purchase-account.invoice.line,name:0"
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "model:purchase.purchase-account.invoice.line,name:"
msgid "Purchase - Invoice Line"
msgstr ""
-msgctxt "model:purchase.purchase-ignored-account.invoice.line,name:0"
+msgctxt "model:purchase.purchase-ignored-account.invoice.line,name:"
msgid "Purchase - Ignored Invoice Line"
msgstr ""
diff --git a/purchase.py b/purchase.py
index 6d763f4..faa2e96 100644
--- a/purchase.py
+++ b/purchase.py
@@ -24,70 +24,54 @@ class Purchase(ModelSQL, ModelView):
super(Purchase, self).init(module_name)
- def create_invoice(self, purchase_id):
+ def create_invoice(self, purchase):
invoice_obj = Pool().get('account.invoice')
invoice_line_obj = Pool().get('account.invoice.line')
- res = super(Purchase, self).create_invoice(purchase_id)
+ invoice_id = super(Purchase, self).create_invoice(purchase)
- if res:
- invoice = invoice_obj.browse(res)
+ if invoice_id:
+ invoice = invoice_obj.browse(invoice_id)
line_ids = [x.id for x in invoice.lines]
with Transaction().set_user(0, set_context=True):
invoice_line_obj.write(line_ids, {
- 'invoice': False,
+ 'invoice': None,
'invoice_type': invoice.type,
'party': invoice.party,
'currency': invoice.currency.id,
'company': invoice.company.id,
})
- self.write(purchase_id, {
- 'invoices': [('unlink', res)],
+ self.write(purchase.id, {
+ 'invoices': [('unlink', invoice_id)],
'invoice_lines': [('add', line_ids)],
})
with Transaction().set_user(0, set_context=True):
- invoice_obj.workflow_trigger_validate(res, 'cancel')
- invoice_obj.delete(res)
- res = None
- return res
-
- def get_invoice_paid(self, purchases):
- res = super(Purchase, self).get_invoice_paid(purchases)
- for purchase in purchases:
- val = True
- ignored_ids = [x.id for x in purchase.invoice_lines_ignored]
- for invoice_line in purchase.invoice_lines:
- if not invoice_line.invoice:
- val = False
- break
- if invoice_line.invoice.state != 'paid' \
- and invoice_line.id not in ignored_ids:
- val = False
- break
- res[purchase.id] = val
- return res
-
- def get_invoice_exception(self, purchases):
- res = super(Purchase, self).get_invoice_exception(purchases)
-
- for purchase in purchases:
- val = False
- ignored_ids = [x.id for x in purchase.invoice_lines_ignored]
- for invoice_line in purchase.invoice_lines:
- if invoice_line.invoice \
- and invoice_line.invoice.state == 'cancel' \
- and invoice_line.id not in ignored_ids:
- val = True
- break
- res[purchase.id] = val
- return res
+ invoice_obj.cancel([invoice_id])
+ invoice_obj.delete(invoice_id)
+ return None
+ return invoice_id
+
+ def get_invoice_state(self, purchase):
+ state = super(Purchase, self).get_invoice_state(purchase)
+ skip_ids = set(x.id for x in purchase.invoice_lines_ignored)
+ invoice_lines = [l for l in purchase.invoice_lines
+ if l.id not in skip_ids]
+ if invoice_lines:
+ if any(l.invoice and l.invoice.state == 'cancel'
+ for l in invoice_lines):
+ return 'exception'
+ elif (state == 'paid'
+ and all(l.invoice for l in invoice_lines)
+ and all(l.invoice.state == 'paid' for l in invoice_lines)):
+ return 'paid'
+ return state
def copy(self, ids, default=None):
if default is None:
default = {}
default = default.copy()
- default['invoice_lines'] = False
- default['invoice_lines_ignored'] = False
+ default['invoice_lines'] = None
+ default['invoice_lines_ignored'] = None
return super(Purchase, self).copy(ids, default=default)
def ignore_invoice_exception(self, purchase_id):
@@ -100,11 +84,9 @@ class Purchase(ModelSQL, ModelView):
invoice_line_ids.append(invoice_line.id)
if invoice_line_ids:
self.write(purchase_id, {
- 'invoice_lines_ignored': [('add', x) for x in invoice_line_ids],
- })
-
- def wkf_triggered_invoice_lines(self, purchase):
- return [x.id for x in purchase.invoice_lines]
+ 'invoice_lines_ignored': [
+ ('add', x) for x in invoice_line_ids],
+ })
Purchase()
@@ -115,9 +97,9 @@ class PurchaseInvoiceLine(ModelSQL):
_table = 'purchase_invoice_line_rel'
_description = __doc__
purchase = fields.Many2One('purchase.purchase', 'Purchase',
- ondelete='CASCADE', select=1, required=True)
+ ondelete='CASCADE', select=True, required=True)
line = fields.Many2One('account.invoice.line', 'Invoice Line',
- ondelete='RESTRICT', select=1, required=True)
+ ondelete='RESTRICT', select=True, required=True)
PurchaseInvoiceLine()
@@ -128,8 +110,8 @@ class PurchaseIgnoredInvoiceLine(ModelSQL):
_table = 'purchase_invoice_line_ignored_rel'
_description = __doc__
purchase = fields.Many2One('purchase.purchase', 'Purchase',
- ondelete='CASCADE', select=1, required=True)
+ ondelete='CASCADE', select=True, required=True)
invoice = fields.Many2One('account.invoice.line', 'Invoice Line',
- ondelete='RESTRICT', select=1, required=True)
+ ondelete='RESTRICT', select=True, required=True)
PurchaseIgnoredInvoiceLine()
diff --git a/purchase.xml b/purchase.xml
index cf8761b..92ce483 100644
--- a/purchase.xml
+++ b/purchase.xml
@@ -18,28 +18,5 @@ this repository contains the full copyright notices and license terms. -->
]]>
</field>
</record>
-
- <record model="workflow.transition"
- id="purchase_transition_waiting_invoice_purchase_invoice_done">
- <field name="act_from"
- ref="purchase.purchase_activity_waiting_invoice_purchase"/>
- <field name="act_to"
- ref="purchase.purchase_activity_invoice_done"/>
- <field name="trigger_model">account.invoice.line</field>
- <field name="trigger_ids">wkf_triggered_invoice_lines</field>
- <field name="condition">invoice_paid</field>
- </record>
-
- <record model="workflow.transition"
- id="purchase_transition_waiting_invoice_shipment_invoice_shipment_done">
- <field name="act_from"
- ref="purchase.purchase_activity_waiting_invoice_shipment"/>
- <field name="act_to"
- ref="purchase.purchase_activity_invoice_shipment_done"/>
- <field name="trigger_model">account.invoice.line</field>
- <field name="trigger_ids">wkf_triggered_invoice_lines</field>
- <field name="condition">invoice_paid</field>
- </record>
-
</data>
</tryton>
diff --git a/setup.py b/setup.py
index 49824e7..7a9b4c2 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 e703636..b1fbc57 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_purchase_invoice_line_standalone import suite
+from .test_purchase_invoice_line_standalone import suite
diff --git a/tests/test_purchase_invoice_line_standalone.py b/tests/test_purchase_invoice_line_standalone.py
index 5267395..0ff5900 100644
--- a/tests/test_purchase_invoice_line_standalone.py
+++ b/tests/test_purchase_invoice_line_standalone.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):
@@ -34,6 +35,7 @@ class PurchaseInvoiceLineStandaloneTestCase(unittest.TestCase):
'''
test_depends()
+
def suite():
suite = trytond.tests.test_tryton.suite()
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
diff --git a/trytond_purchase_invoice_line_standalone.egg-info/PKG-INFO b/trytond_purchase_invoice_line_standalone.egg-info/PKG-INFO
index 22d31cd..b8c7cce 100644
--- a/trytond_purchase_invoice_line_standalone.egg-info/PKG-INFO
+++ b/trytond_purchase_invoice_line_standalone.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-purchase-invoice-line-standalone
-Version: 2.2.0
+Version: 2.4.0
Summary:
Change the purchase order behaviour to create standalone invoice lines instead of a
complete invoice. This allow to compose invoices with lines originating
@@ -10,7 +10,7 @@ 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_purchase_invoice_line_standalone.egg-info/SOURCES.txt b/trytond_purchase_invoice_line_standalone.egg-info/SOURCES.txt
index 2507e27..e82a1a0 100644
--- a/trytond_purchase_invoice_line_standalone.egg-info/SOURCES.txt
+++ b/trytond_purchase_invoice_line_standalone.egg-info/SOURCES.txt
@@ -13,8 +13,10 @@ setup.py
./tests/__init__.py
./tests/test_purchase_invoice_line_standalone.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_purchase_invoice_line_standalone.egg-info/requires.txt b/trytond_purchase_invoice_line_standalone.egg-info/requires.txt
index bf0b01a..75d6cfe 100644
--- a/trytond_purchase_invoice_line_standalone.egg-info/requires.txt
+++ b/trytond_purchase_invoice_line_standalone.egg-info/requires.txt
@@ -1,3 +1,3 @@
-trytond_purchase >= 2.2, < 2.3
-trytond_account_invoice_line_standalone >= 2.2, < 2.3
-trytond >= 2.2, < 2.3
\ No newline at end of file
+trytond_purchase >= 2.4, < 2.5
+trytond_account_invoice_line_standalone >= 2.4, < 2.5
+trytond >= 2.4, < 2.5
\ No newline at end of file
commit 0594e834548f0d54755aaa85187b0c5a6f7079b4
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Oct 31 16:21:20 2011 +0100
Adding upstream version 2.2.0.
diff --git a/CHANGELOG b/CHANGELOG
index a141548..80fd666 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.0 - 2011-10-25
+* 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 f86684a..ae2131f 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_purchase_invoice_line_standalone
-Version: 2.0.0
+Version: 2.2.0
Summary:
Change the purchase order behaviour to create standalone invoice lines instead of a
complete invoice. This allow to compose invoices with lines originating
@@ -10,22 +10,25 @@ 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 :: Legal Industry
Classifier: Intended Audience :: Manufacturing
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Czech
Classifier: Natural Language :: English
+Classifier: Natural Language :: Dutch
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 129cda3..6f1521a 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -7,7 +7,7 @@
"name_es_CO" : "Línea de Factura autónoma en Compras",
"name_es_ES" : "Línea de factura de compra independiente",
"name_fr_FR" : "Ligne de facture autonome - Achat",
- "version" : "2.0.0",
+ "version" : "2.2.0",
"author" : "B2CK",
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
@@ -17,7 +17,7 @@ complete invoice. This allow to compose invoices with lines originating
from differents purchases.
''',
"description_bg_BG": '''Покупка с независима фактура
- - Промяна на поведението при поръчка за покупка като вместо пълна фактура
+ - Промяна на поведението при поръчка за покупка като вместо пълна фактура
създава редове с независими фактури.
- Позволява създаване на фактури с редове от различни покупки.
''',
@@ -49,10 +49,13 @@ composer des factures avec des lignes provenant de différents achats.
"purchase.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 470d52d..0000000
--- a/bg_BG.csv
+++ /dev/null
@@ -1,12 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,account.invoice.line,0,You can not delete invoice lines that comes from a purchase!,Не може да изтривате редове от фактура която идва от покупка!,0
-field,"purchase.purchase,invoice_lines",0,Invoice Lines,Редове от фактура,0
-field,"purchase.purchase,invoice_lines_ignored",0,Invoice Lines Ignored,Игнорирани редове от фактура,0
-field,"purchase.purchase-account.invoice.line,line",0,Invoice Line,Ред от фактура,0
-field,"purchase.purchase-account.invoice.line,purchase",0,Purchase,Покупки,0
-field,"purchase.purchase-account.invoice.line,rec_name",0,Name,Име,0
-field,"purchase.purchase-ignored-account.invoice.line,invoice",0,Invoice Line,Ред от фактура,0
-field,"purchase.purchase-ignored-account.invoice.line,purchase",0,Purchase,Покупки,0
-field,"purchase.purchase-ignored-account.invoice.line,rec_name",0,Name,Име,0
-model,"purchase.purchase-account.invoice.line,name",0,Purchase - Invoice Line,Покупка - Ред от фактура,0
-model,"purchase.purchase-ignored-account.invoice.line,name",0,Purchase - Ignored Invoice Line,Покупка - Игнорирани редове от фактура,0
diff --git a/de_DE.csv b/de_DE.csv
deleted file mode 100644
index e072045..0000000
--- a/de_DE.csv
+++ /dev/null
@@ -1,12 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,account.invoice.line,0,You can not delete invoice lines that comes from a purchase!,Aus einem Einkauf stammende Rechnungspositionen können nicht gelöscht werden!,0
-field,"purchase.purchase,invoice_lines",0,Invoice Lines,Rechnungspositionen Kunden,0
-field,"purchase.purchase,invoice_lines_ignored",0,Invoice Lines Ignored,Ignorierte Rechnungspositionen,0
-field,"purchase.purchase-account.invoice.line,line",0,Invoice Line,Rechnungsposition Kunde,0
-field,"purchase.purchase-account.invoice.line,purchase",0,Purchase,Einkauf,0
-field,"purchase.purchase-account.invoice.line,rec_name",0,Name,Name,0
-field,"purchase.purchase-ignored-account.invoice.line,invoice",0,Invoice Line,Rechnungsposition Kunde,0
-field,"purchase.purchase-ignored-account.invoice.line,purchase",0,Purchase,Einkauf,0
-field,"purchase.purchase-ignored-account.invoice.line,rec_name",0,Name,Name,0
-model,"purchase.purchase-account.invoice.line,name",0,Purchase - Invoice Line,Einkauf - Rechnungsposition,0
-model,"purchase.purchase-ignored-account.invoice.line,name",0,Purchase - Ignored Invoice Line,Einkauf - Ignorierte Rechnungsposition,0
diff --git a/es_CO.csv b/es_CO.csv
deleted file mode 100644
index 0da92d0..0000000
--- a/es_CO.csv
+++ /dev/null
@@ -1,12 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,account.invoice.line,0,You can not delete invoice lines that comes from a purchase!,¡No puede eliminar líneas que vienen de una compra!,0
-field,"purchase.purchase-account.invoice.line,line",0,Invoice Line,Línea de Factura,0
-field,"purchase.purchase-account.invoice.line,purchase",0,Purchase,Compras,0
-field,"purchase.purchase-account.invoice.line,rec_name",0,Name,Nombre,0
-field,"purchase.purchase-ignored-account.invoice.line,invoice",0,Invoice Line,Línea de Factura,0
-field,"purchase.purchase-ignored-account.invoice.line,purchase",0,Purchase,Compras,0
-field,"purchase.purchase-ignored-account.invoice.line,rec_name",0,Name,Nombre,0
-field,"purchase.purchase,invoice_lines",0,Invoice Lines,Líneas de Factura,0
-field,"purchase.purchase,invoice_lines_ignored",0,Invoice Lines Ignored,Líneas de Factura ignoradas,0
-model,"purchase.purchase-account.invoice.line,name",0,Purchase - Invoice Line,Compras - Línea de Factura,0
-model,"purchase.purchase-ignored-account.invoice.line,name",0,Purchase - Ignored Invoice Line,Compras - Línea de Factura ignorada,0
diff --git a/es_ES.csv b/es_ES.csv
deleted file mode 100644
index f86dc79..0000000
--- a/es_ES.csv
+++ /dev/null
@@ -1,12 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,account.invoice.line,0,You can not delete invoice lines that comes from a purchase!,No puede borrar líneas que vienen de una compra,0
-field,"purchase.purchase-account.invoice.line,line",0,Invoice Line,Línea de factura,0
-field,"purchase.purchase-account.invoice.line,purchase",0,Purchase,Compra,0
-field,"purchase.purchase-account.invoice.line,rec_name",0,Name,Nombre,0
-field,"purchase.purchase-ignored-account.invoice.line,invoice",0,Invoice Line,Línea de factura,0
-field,"purchase.purchase-ignored-account.invoice.line,purchase",0,Purchase,Compra,0
-field,"purchase.purchase-ignored-account.invoice.line,rec_name",0,Name,Nombre,0
-field,"purchase.purchase,invoice_lines",0,Invoice Lines,Líneas de factura,0
-field,"purchase.purchase,invoice_lines_ignored",0,Invoice Lines Ignored,Líneas de factura ignoradas,0
-model,"purchase.purchase-account.invoice.line,name",0,Purchase - Invoice Line,Compra - Línea de factura,0
-model,"purchase.purchase-ignored-account.invoice.line,name",0,Purchase - Ignored Invoice Line,Compra - Línea de factura ignorada,0
diff --git a/fr_FR.csv b/fr_FR.csv
deleted file mode 100644
index 3d4077a..0000000
--- a/fr_FR.csv
+++ /dev/null
@@ -1,12 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,account.invoice.line,0,You can not delete invoice lines that comes from a purchase!,Vous ne pouvez pas supprimer des lignes de facture qui viennent d'un achat !,0
-field,"purchase.purchase,invoice_lines",0,Invoice Lines,Lignes de facture,0
-field,"purchase.purchase,invoice_lines_ignored",0,Invoice Lines Ignored,Lignes de facture ignorées,0
-field,"purchase.purchase-account.invoice.line,line",0,Invoice Line,Ligne de facture,0
-field,"purchase.purchase-account.invoice.line,purchase",0,Purchase,Achat,0
-field,"purchase.purchase-account.invoice.line,rec_name",0,Name,Nom,0
-field,"purchase.purchase-ignored-account.invoice.line,invoice",0,Invoice Line,Ligne de facture,0
-field,"purchase.purchase-ignored-account.invoice.line,purchase",0,Purchase,Achat,0
-field,"purchase.purchase-ignored-account.invoice.line,rec_name",0,Name,Nom,0
-model,"purchase.purchase-account.invoice.line,name",0,Purchase - Invoice Line,Achat - Ligne de facture,0
-model,"purchase.purchase-ignored-account.invoice.line,name",0,Purchase - Ignored Invoice Line,Achat - Ligne de facture ignorée,0
diff --git a/invoice.py b/invoice.py
index 3d90a0d..6a6c287 100644
--- a/invoice.py
+++ b/invoice.py
@@ -2,14 +2,15 @@
#of this repository contains the full copyright notices and license terms.
from trytond.model import ModelView, ModelSQL, fields
from trytond.transaction import Transaction
+from trytond.pool import Pool
class Invoice(ModelSQL, ModelView):
_name = 'account.invoice'
def write(self, ids, vals):
- invoice_line_obj = self.pool.get('account.invoice.line')
- purchase_obj = self.pool.get('purchase.purchase')
+ invoice_line_obj = Pool().get('account.invoice.line')
+ purchase_obj = Pool().get('purchase.purchase')
res = super(Invoice, self).write(ids, vals)
if 'state' in vals and vals['state'] in ('paid', 'cancel'):
if isinstance(ids, (int, long)):
@@ -36,7 +37,7 @@ class InvoiceLine(ModelSQL, ModelView):
})
def write(self, ids, vals):
- purchase_obj = self.pool.get('purchase.purchase')
+ purchase_obj = Pool().get('purchase.purchase')
if 'invoice' in vals:
if isinstance(ids, (int, long)):
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
new file mode 100644
index 0000000..020d9af
--- /dev/null
+++ b/locale/bg_BG.po
@@ -0,0 +1,47 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:account.invoice.line:0"
+msgid "You can not delete invoice lines that comes from a purchase!"
+msgstr "Не може да изтривате редове от фактура която идва от покупка!"
+
+msgctxt "field:purchase.purchase,invoice_lines:0"
+msgid "Invoice Lines"
+msgstr "Редове от фактура"
+
+msgctxt "field:purchase.purchase,invoice_lines_ignored:0"
+msgid "Invoice Lines Ignored"
+msgstr "Игнорирани редове от фактура"
+
+msgctxt "field:purchase.purchase-account.invoice.line,line:0"
+msgid "Invoice Line"
+msgstr "Ред от фактура"
+
+msgctxt "field:purchase.purchase-account.invoice.line,purchase:0"
+msgid "Purchase"
+msgstr "Покупки"
+
+msgctxt "field:purchase.purchase-account.invoice.line,rec_name:0"
+msgid "Name"
+msgstr "Име"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,invoice:0"
+msgid "Invoice Line"
+msgstr "Ред от фактура"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,purchase:0"
+msgid "Purchase"
+msgstr "Покупки"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,rec_name:0"
+msgid "Name"
+msgstr "Име"
+
+msgctxt "model:purchase.purchase-account.invoice.line,name:0"
+msgid "Purchase - Invoice Line"
+msgstr "Покупка - Ред от фактура"
+
+msgctxt "model:purchase.purchase-ignored-account.invoice.line,name:0"
+msgid "Purchase - Ignored Invoice Line"
+msgstr "Покупка - Игнорирани редове от фактура"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
new file mode 100644
index 0000000..fd8554d
--- /dev/null
+++ b/locale/cs_CZ.po
@@ -0,0 +1,47 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:account.invoice.line:0"
+msgid "You can not delete invoice lines that comes from a purchase!"
+msgstr ""
+
+msgctxt "field:purchase.purchase,invoice_lines:0"
+msgid "Invoice Lines"
+msgstr ""
+
+msgctxt "field:purchase.purchase,invoice_lines_ignored:0"
+msgid "Invoice Lines Ignored"
+msgstr ""
+
+msgctxt "field:purchase.purchase-account.invoice.line,line:0"
+msgid "Invoice Line"
+msgstr ""
+
+msgctxt "field:purchase.purchase-account.invoice.line,purchase:0"
+msgid "Purchase"
+msgstr ""
+
+msgctxt "field:purchase.purchase-account.invoice.line,rec_name:0"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,invoice:0"
+msgid "Invoice Line"
+msgstr ""
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,purchase:0"
+msgid "Purchase"
+msgstr ""
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,rec_name:0"
+msgid "Name"
+msgstr ""
+
+msgctxt "model:purchase.purchase-account.invoice.line,name:0"
+msgid "Purchase - Invoice Line"
+msgstr ""
+
+msgctxt "model:purchase.purchase-ignored-account.invoice.line,name:0"
+msgid "Purchase - Ignored Invoice Line"
+msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
new file mode 100644
index 0000000..6ab5ea1
--- /dev/null
+++ b/locale/de_DE.po
@@ -0,0 +1,49 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:account.invoice.line:0"
+msgid "You can not delete invoice lines that comes from a purchase!"
+msgstr ""
+"Aus einem Einkauf stammende Rechnungspositionen können nicht gelöscht "
+"werden!"
+
+msgctxt "field:purchase.purchase,invoice_lines:0"
+msgid "Invoice Lines"
+msgstr "Rechnungspositionen Kunden"
+
+msgctxt "field:purchase.purchase,invoice_lines_ignored:0"
+msgid "Invoice Lines Ignored"
+msgstr "Ignorierte Rechnungspositionen"
+
+msgctxt "field:purchase.purchase-account.invoice.line,line:0"
+msgid "Invoice Line"
+msgstr "Rechnungsposition Kunde"
+
+msgctxt "field:purchase.purchase-account.invoice.line,purchase:0"
+msgid "Purchase"
+msgstr "Einkauf"
+
+msgctxt "field:purchase.purchase-account.invoice.line,rec_name:0"
+msgid "Name"
+msgstr "Name"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,invoice:0"
+msgid "Invoice Line"
+msgstr "Rechnungsposition Kunde"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,purchase:0"
+msgid "Purchase"
+msgstr "Einkauf"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,rec_name:0"
+msgid "Name"
+msgstr "Name"
+
+msgctxt "model:purchase.purchase-account.invoice.line,name:0"
+msgid "Purchase - Invoice Line"
+msgstr "Einkauf - Rechnungsposition"
+
+msgctxt "model:purchase.purchase-ignored-account.invoice.line,name:0"
+msgid "Purchase - Ignored Invoice Line"
+msgstr "Einkauf - Ignorierte Rechnungsposition"
diff --git a/locale/es_CO.po b/locale/es_CO.po
new file mode 100644
index 0000000..444a18c
--- /dev/null
+++ b/locale/es_CO.po
@@ -0,0 +1,47 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:account.invoice.line:0"
+msgid "You can not delete invoice lines that comes from a purchase!"
+msgstr "¡No puede eliminar líneas que vienen de una compra!"
+
+msgctxt "field:purchase.purchase,invoice_lines:0"
+msgid "Invoice Lines"
+msgstr "Líneas de Factura"
+
+msgctxt "field:purchase.purchase,invoice_lines_ignored:0"
+msgid "Invoice Lines Ignored"
+msgstr "Líneas de Factura ignoradas"
+
+msgctxt "field:purchase.purchase-account.invoice.line,line:0"
+msgid "Invoice Line"
+msgstr "Línea de Factura"
+
+msgctxt "field:purchase.purchase-account.invoice.line,purchase:0"
+msgid "Purchase"
+msgstr "Compras"
+
+msgctxt "field:purchase.purchase-account.invoice.line,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,invoice:0"
+msgid "Invoice Line"
+msgstr "Línea de Factura"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,purchase:0"
+msgid "Purchase"
+msgstr "Compras"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "model:purchase.purchase-account.invoice.line,name:0"
+msgid "Purchase - Invoice Line"
+msgstr "Compras - Línea de Factura"
+
+msgctxt "model:purchase.purchase-ignored-account.invoice.line,name:0"
+msgid "Purchase - Ignored Invoice Line"
+msgstr "Compras - Línea de Factura ignorada"
diff --git a/locale/es_ES.po b/locale/es_ES.po
new file mode 100644
index 0000000..07f2009
--- /dev/null
+++ b/locale/es_ES.po
@@ -0,0 +1,47 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:account.invoice.line:0"
+msgid "You can not delete invoice lines that comes from a purchase!"
+msgstr "No puede borrar líneas que vienen de una compra"
+
+msgctxt "field:purchase.purchase,invoice_lines:0"
+msgid "Invoice Lines"
+msgstr "Líneas de factura"
+
+msgctxt "field:purchase.purchase,invoice_lines_ignored:0"
+msgid "Invoice Lines Ignored"
+msgstr "Líneas de factura ignoradas"
+
+msgctxt "field:purchase.purchase-account.invoice.line,line:0"
+msgid "Invoice Line"
+msgstr "Línea de factura"
+
+msgctxt "field:purchase.purchase-account.invoice.line,purchase:0"
+msgid "Purchase"
+msgstr "Compra"
+
+msgctxt "field:purchase.purchase-account.invoice.line,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,invoice:0"
+msgid "Invoice Line"
+msgstr "Línea de factura"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,purchase:0"
+msgid "Purchase"
+msgstr "Compra"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "model:purchase.purchase-account.invoice.line,name:0"
+msgid "Purchase - Invoice Line"
+msgstr "Compra - Línea de factura"
+
+msgctxt "model:purchase.purchase-ignored-account.invoice.line,name:0"
+msgid "Purchase - Ignored Invoice Line"
+msgstr "Compra - Línea de factura ignorada"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
new file mode 100644
index 0000000..b50fa8c
--- /dev/null
+++ b/locale/fr_FR.po
@@ -0,0 +1,48 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:account.invoice.line:0"
+msgid "You can not delete invoice lines that comes from a purchase!"
+msgstr ""
+"Vous ne pouvez pas supprimer des lignes de facture qui viennent d'un achat !"
+
+msgctxt "field:purchase.purchase,invoice_lines:0"
+msgid "Invoice Lines"
+msgstr "Lignes de facture"
+
+msgctxt "field:purchase.purchase,invoice_lines_ignored:0"
+msgid "Invoice Lines Ignored"
+msgstr "Lignes de facture ignorées"
+
+msgctxt "field:purchase.purchase-account.invoice.line,line:0"
+msgid "Invoice Line"
+msgstr "Ligne de facture"
+
+msgctxt "field:purchase.purchase-account.invoice.line,purchase:0"
+msgid "Purchase"
+msgstr "Achat"
+
+msgctxt "field:purchase.purchase-account.invoice.line,rec_name:0"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,invoice:0"
+msgid "Invoice Line"
+msgstr "Ligne de facture"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,purchase:0"
+msgid "Purchase"
+msgstr "Achat"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,rec_name:0"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "model:purchase.purchase-account.invoice.line,name:0"
+msgid "Purchase - Invoice Line"
+msgstr "Achat - Ligne de facture"
+
+msgctxt "model:purchase.purchase-ignored-account.invoice.line,name:0"
+msgid "Purchase - Ignored Invoice Line"
+msgstr "Achat - Ligne de facture ignorée"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
new file mode 100644
index 0000000..c334ec5
--- /dev/null
+++ b/locale/nl_NL.po
@@ -0,0 +1,52 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:account.invoice.line:0"
+msgid "You can not delete invoice lines that comes from a purchase!"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:purchase.purchase,invoice_lines:0"
+msgid "Invoice Lines"
+msgstr "Factuurregels"
+
+msgctxt "field:purchase.purchase,invoice_lines_ignored:0"
+msgid "Invoice Lines Ignored"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:purchase.purchase-account.invoice.line,line:0"
+msgid "Invoice Line"
+msgstr "Factuurregel"
+
+msgctxt "field:purchase.purchase-account.invoice.line,purchase:0"
+msgid "Purchase"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:purchase.purchase-account.invoice.line,rec_name:0"
+msgid "Name"
+msgstr "Naam bijlage"
+
+#, fuzzy
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,invoice:0"
+msgid "Invoice Line"
+msgstr "Factuurregel"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,purchase:0"
+msgid "Purchase"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,rec_name:0"
+msgid "Name"
+msgstr "Naam bijlage"
+
+msgctxt "model:purchase.purchase-account.invoice.line,name:0"
+msgid "Purchase - Invoice Line"
+msgstr ""
+
+msgctxt "model:purchase.purchase-ignored-account.invoice.line,name:0"
+msgid "Purchase - Ignored Invoice Line"
+msgstr ""
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
new file mode 100644
index 0000000..288755e
--- /dev/null
+++ b/locale/ru_RU.po
@@ -0,0 +1,49 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:account.invoice.line:0"
+msgid "You can not delete invoice lines that comes from a purchase!"
+msgstr ""
+
+msgctxt "field:purchase.purchase,invoice_lines:0"
+msgid "Invoice Lines"
+msgstr ""
+
+msgctxt "field:purchase.purchase,invoice_lines_ignored:0"
+msgid "Invoice Lines Ignored"
+msgstr ""
+
+msgctxt "field:purchase.purchase-account.invoice.line,line:0"
+msgid "Invoice Line"
+msgstr ""
+
+msgctxt "field:purchase.purchase-account.invoice.line,purchase:0"
+msgid "Purchase"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:purchase.purchase-account.invoice.line,rec_name:0"
+msgid "Name"
+msgstr "Наименование"
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,invoice:0"
+msgid "Invoice Line"
+msgstr ""
+
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,purchase:0"
+msgid "Purchase"
+msgstr ""
+
+#, fuzzy
+msgctxt "field:purchase.purchase-ignored-account.invoice.line,rec_name:0"
+msgid "Name"
+msgstr "Наименование"
+
+msgctxt "model:purchase.purchase-account.invoice.line,name:0"
+msgid "Purchase - Invoice Line"
+msgstr ""
+
+msgctxt "model:purchase.purchase-ignored-account.invoice.line,name:0"
+msgid "Purchase - Ignored Invoice Line"
+msgstr ""
diff --git a/purchase.py b/purchase.py
index 52fdd03..6d763f4 100644
--- a/purchase.py
+++ b/purchase.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.
-from __future__ import with_statement
from trytond.model import ModelView, ModelSQL, fields
from trytond.transaction import Transaction
+from trytond.pool import Pool
+
class Purchase(ModelSQL, ModelView):
_name = 'purchase.purchase'
@@ -24,8 +25,8 @@ class Purchase(ModelSQL, ModelView):
super(Purchase, self).init(module_name)
def create_invoice(self, purchase_id):
- invoice_obj = self.pool.get('account.invoice')
- invoice_line_obj = self.pool.get('account.invoice.line')
+ invoice_obj = Pool().get('account.invoice')
+ invoice_line_obj = Pool().get('account.invoice.line')
res = super(Purchase, self).create_invoice(purchase_id)
@@ -102,6 +103,9 @@ class Purchase(ModelSQL, ModelView):
'invoice_lines_ignored': [('add', x) for x in invoice_line_ids],
})
+ def wkf_triggered_invoice_lines(self, purchase):
+ return [x.id for x in purchase.invoice_lines]
+
Purchase()
diff --git a/purchase.xml b/purchase.xml
index c562f3b..cf8761b 100644
--- a/purchase.xml
+++ b/purchase.xml
@@ -12,7 +12,6 @@ this repository contains the full copyright notices and license terms. -->
<xpath
expr="/form/notebook/page/field[@name="invoices"]"
position="after">
- <separator name="invoice_lines" colspan="4"/>
<field name="invoice_lines" colspan="4"/>
</xpath>
</data>
@@ -27,7 +26,7 @@ this repository contains the full copyright notices and license terms. -->
<field name="act_to"
ref="purchase.purchase_activity_invoice_done"/>
<field name="trigger_model">account.invoice.line</field>
- <field name="trigger_expr_id">[x.id for x in invoice_lines]</field>
+ <field name="trigger_ids">wkf_triggered_invoice_lines</field>
<field name="condition">invoice_paid</field>
</record>
@@ -38,7 +37,7 @@ this repository contains the full copyright notices and license terms. -->
<field name="act_to"
ref="purchase.purchase_activity_invoice_shipment_done"/>
<field name="trigger_model">account.invoice.line</field>
- <field name="trigger_expr_id">[x.id for x in invoice_lines]</field>
+ <field name="trigger_ids">wkf_triggered_invoice_lines</field>
<field name="condition">invoice_paid</field>
</record>
diff --git a/setup.py b/setup.py
index 44cefe8..49824e7 100644
--- a/setup.py
+++ b/setup.py
@@ -39,17 +39,20 @@ setup(name='trytond_purchase_invoice_line_standalone',
classifiers=[
'Development Status :: 5 - Production/Stable',
'Environment :: Plugins',
+ 'Framework :: Tryton',
'Intended Audience :: Developers',
'Intended Audience :: Legal Industry',
'Intended Audience :: Manufacturing',
'License :: OSI Approved :: GNU General Public License (GPL)',
'Natural Language :: Bulgarian',
+ 'Natural Language :: Czech',
'Natural Language :: English',
+ 'Natural Language :: Dutch',
'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_purchase_invoice_line_standalone.py b/tests/test_purchase_invoice_line_standalone.py
index a152a37..5267395 100644
--- a/tests/test_purchase_invoice_line_standalone.py
+++ b/tests/test_purchase_invoice_line_standalone.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 PurchaseInvoiceLineStandaloneTestCase(unittest.TestCase):
@@ -28,6 +28,12 @@ class PurchaseInvoiceLineStandaloneTestCase(unittest.TestCase):
'''
test_view('purchase_invoice_line_standalone')
+ def test0006depends(self):
+ '''
+ Test depends.
+ '''
+ test_depends()
+
def suite():
suite = trytond.tests.test_tryton.suite()
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
diff --git a/trytond_purchase_invoice_line_standalone.egg-info/PKG-INFO b/trytond_purchase_invoice_line_standalone.egg-info/PKG-INFO
index 7cbb394..22d31cd 100644
--- a/trytond_purchase_invoice_line_standalone.egg-info/PKG-INFO
+++ b/trytond_purchase_invoice_line_standalone.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-purchase-invoice-line-standalone
-Version: 2.0.0
+Version: 2.2.0
Summary:
Change the purchase order behaviour to create standalone invoice lines instead of a
complete invoice. This allow to compose invoices with lines originating
@@ -10,22 +10,25 @@ 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 :: Legal Industry
Classifier: Intended Audience :: Manufacturing
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Czech
Classifier: Natural Language :: English
+Classifier: Natural Language :: Dutch
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_purchase_invoice_line_standalone.egg-info/SOURCES.txt b/trytond_purchase_invoice_line_standalone.egg-info/SOURCES.txt
index d2ad30c..2507e27 100644
--- a/trytond_purchase_invoice_line_standalone.egg-info/SOURCES.txt
+++ b/trytond_purchase_invoice_line_standalone.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
purchase.xml
setup.py
./__init__.py
@@ -17,6 +12,14 @@ setup.py
./purchase.py
./tests/__init__.py
./tests/test_purchase_invoice_line_standalone.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_purchase_invoice_line_standalone.egg-info/PKG-INFO
trytond_purchase_invoice_line_standalone.egg-info/SOURCES.txt
trytond_purchase_invoice_line_standalone.egg-info/dependency_links.txt
diff --git a/trytond_purchase_invoice_line_standalone.egg-info/requires.txt b/trytond_purchase_invoice_line_standalone.egg-info/requires.txt
index 5a777f3..bf0b01a 100644
--- a/trytond_purchase_invoice_line_standalone.egg-info/requires.txt
+++ b/trytond_purchase_invoice_line_standalone.egg-info/requires.txt
@@ -1,3 +1,3 @@
-trytond_purchase >= 2.0, < 2.1
-trytond_account_invoice_line_standalone >= 2.0, < 2.1
-trytond >= 2.0, < 2.1
\ No newline at end of file
+trytond_purchase >= 2.2, < 2.3
+trytond_account_invoice_line_standalone >= 2.2, < 2.3
+trytond >= 2.2, < 2.3
\ No newline at end of file
commit 0dec77dfc7a44cf0e78762add4d8b70335f9142f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue May 24 19:13:00 2011 +0200
Adding upstream version 2.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 353410f..a141548 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 87a696e..f86684a 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_purchase_invoice_line_standalone
-Version: 1.8.0
+Version: 2.0.0
Summary:
Change the purchase order behaviour to create standalone invoice lines instead of a
complete invoice. This allow to compose invoices with lines originating
@@ -10,7 +10,7 @@ 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
@@ -19,10 +19,13 @@ Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Legal Industry
Classifier: Intended Audience :: Manufacturing
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
diff --git a/__tryton__.py b/__tryton__.py
index c97a239..129cda3 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -2,11 +2,12 @@
#this repository contains the full copyright notices and license terms.
{
"name" : "Purchase Invoice Line Standalone",
+ "name_bg_BG" : "Ред от независима фактура към покупка",
"name_de_DE" : "Einkauf ungebundene Rechnungsposition",
"name_es_CO" : "Línea de Factura autónoma en Compras",
"name_es_ES" : "Línea de factura de compra independiente",
"name_fr_FR" : "Ligne de facture autonome - Achat",
- "version" : "1.8.0",
+ "version" : "2.0.0",
"author" : "B2CK",
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
@@ -15,6 +16,11 @@ Change the purchase order behaviour to create standalone invoice lines instead o
complete invoice. This allow to compose invoices with lines originating
from differents purchases.
''',
+ "description_bg_BG": '''Покупка с независима фактура
+ - Промяна на поведението при поръчка за покупка като вместо пълна фактура
+ създава редове с независими фактури.
+ - Позволява създаване на фактури с редове от различни покупки.
+''',
"description_de_DE": '''Einkäufe mit ungebundenen Rechnungspositionen
- Ändert das Verhalten im Einkaufsvorgang, indem unabhängige Rechnungspositionen
an Stelle einer kompletten Rechnung erstellt werden.
@@ -43,6 +49,7 @@ composer des factures avec des lignes provenant de différents achats.
"purchase.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..470d52d
--- /dev/null
+++ b/bg_BG.csv
@@ -0,0 +1,12 @@
+type,name,res_id,src,value,fuzzy
+error,account.invoice.line,0,You can not delete invoice lines that comes from a purchase!,Не може да изтривате редове от фактура която идва от покупка!,0
+field,"purchase.purchase,invoice_lines",0,Invoice Lines,Редове от фактура,0
+field,"purchase.purchase,invoice_lines_ignored",0,Invoice Lines Ignored,Игнорирани редове от фактура,0
+field,"purchase.purchase-account.invoice.line,line",0,Invoice Line,Ред от фактура,0
+field,"purchase.purchase-account.invoice.line,purchase",0,Purchase,Покупки,0
+field,"purchase.purchase-account.invoice.line,rec_name",0,Name,Име,0
+field,"purchase.purchase-ignored-account.invoice.line,invoice",0,Invoice Line,Ред от фактура,0
+field,"purchase.purchase-ignored-account.invoice.line,purchase",0,Purchase,Покупки,0
+field,"purchase.purchase-ignored-account.invoice.line,rec_name",0,Name,Име,0
+model,"purchase.purchase-account.invoice.line,name",0,Purchase - Invoice Line,Покупка - Ред от фактура,0
+model,"purchase.purchase-ignored-account.invoice.line,name",0,Purchase - Ignored Invoice Line,Покупка - Игнорирани редове от фактура,0
diff --git a/setup.py b/setup.py
index d4286c7..44cefe8 100644
--- a/setup.py
+++ b/setup.py
@@ -43,12 +43,15 @@ setup(name='trytond_purchase_invoice_line_standalone',
'Intended Audience :: Legal Industry',
'Intended Audience :: Manufacturing',
'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',
],
license='GPL-3',
diff --git a/trytond_purchase_invoice_line_standalone.egg-info/PKG-INFO b/trytond_purchase_invoice_line_standalone.egg-info/PKG-INFO
index 6316cd2..7cbb394 100644
--- a/trytond_purchase_invoice_line_standalone.egg-info/PKG-INFO
+++ b/trytond_purchase_invoice_line_standalone.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-purchase-invoice-line-standalone
-Version: 1.8.0
+Version: 2.0.0
Summary:
Change the purchase order behaviour to create standalone invoice lines instead of a
complete invoice. This allow to compose invoices with lines originating
@@ -10,7 +10,7 @@ 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
@@ -19,10 +19,13 @@ Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Legal Industry
Classifier: Intended Audience :: Manufacturing
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
diff --git a/trytond_purchase_invoice_line_standalone.egg-info/SOURCES.txt b/trytond_purchase_invoice_line_standalone.egg-info/SOURCES.txt
index f630e04..d2ad30c 100644
--- a/trytond_purchase_invoice_line_standalone.egg-info/SOURCES.txt
+++ b/trytond_purchase_invoice_line_standalone.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_purchase_invoice_line_standalone.egg-info/requires.txt b/trytond_purchase_invoice_line_standalone.egg-info/requires.txt
index f08a1a2..5a777f3 100644
--- a/trytond_purchase_invoice_line_standalone.egg-info/requires.txt
+++ b/trytond_purchase_invoice_line_standalone.egg-info/requires.txt
@@ -1,3 +1,3 @@
-trytond_purchase >= 1.8, < 1.9
-trytond_account_invoice_line_standalone >= 1.8, < 1.9
-trytond >= 1.8, < 1.9
\ No newline at end of file
+trytond_purchase >= 2.0, < 2.1
+trytond_account_invoice_line_standalone >= 2.0, < 2.1
+trytond >= 2.0, < 2.1
\ No newline at end of file
commit 25b2b4c16ac69ccd51dfb3eeb0c2c377bb1c6109
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Nov 4 20:12:30 2010 +0100
Adding upstream version 1.8.0.
diff --git a/CHANGELOG b/CHANGELOG
index 95c8625..353410f 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 7cfad9a..5ebab97 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,8 +4,8 @@ Installing trytond_purchase_invoice_line_standalone
Prerequisites
-------------
- * Python 2.4 or later (http://www.python.org/)
- * trytond 0.0.x (http://www.tryton.org/)
+ * Python 2.5 or later (http://www.python.org/)
+ * trytond (http://www.tryton.org/)
* trytond_purchase (http://www.tryton.org/)
* trytond_account_invoice_line_standalone (http://www.tryton.org/)
diff --git a/PKG-INFO b/PKG-INFO
index 636d9f8..87a696e 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_purchase_invoice_line_standalone
-Version: 1.6.0
+Version: 1.8.0
Summary:
Change the purchase order behaviour to create standalone invoice lines instead of a
complete invoice. This allow to compose invoices with lines originating
@@ -10,7 +10,7 @@ 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 82339ce..c97a239 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -6,7 +6,7 @@
"name_es_CO" : "Línea de Factura autónoma en Compras",
"name_es_ES" : "Línea de factura de compra independiente",
"name_fr_FR" : "Ligne de facture autonome - Achat",
- "version" : "1.6.0",
+ "version" : "1.8.0",
"author" : "B2CK",
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/de_DE.csv b/de_DE.csv
index dc982bd..e072045 100644
--- a/de_DE.csv
+++ b/de_DE.csv
@@ -1,12 +1,12 @@
type,name,res_id,src,value,fuzzy
error,account.invoice.line,0,You can not delete invoice lines that comes from a purchase!,Aus einem Einkauf stammende Rechnungspositionen können nicht gelöscht werden!,0
+field,"purchase.purchase,invoice_lines",0,Invoice Lines,Rechnungspositionen Kunden,0
+field,"purchase.purchase,invoice_lines_ignored",0,Invoice Lines Ignored,Ignorierte Rechnungspositionen,0
field,"purchase.purchase-account.invoice.line,line",0,Invoice Line,Rechnungsposition Kunde,0
field,"purchase.purchase-account.invoice.line,purchase",0,Purchase,Einkauf,0
field,"purchase.purchase-account.invoice.line,rec_name",0,Name,Name,0
field,"purchase.purchase-ignored-account.invoice.line,invoice",0,Invoice Line,Rechnungsposition Kunde,0
field,"purchase.purchase-ignored-account.invoice.line,purchase",0,Purchase,Einkauf,0
field,"purchase.purchase-ignored-account.invoice.line,rec_name",0,Name,Name,0
-field,"purchase.purchase,invoice_lines",0,Invoice Lines,Rechnungspositionen Kunden,0
-field,"purchase.purchase,invoice_lines_ignored",0,Invoice Lines Ignored,Ignorierte Rechnungspositionen,0
model,"purchase.purchase-account.invoice.line,name",0,Purchase - Invoice Line,Einkauf - Rechnungsposition,0
model,"purchase.purchase-ignored-account.invoice.line,name",0,Purchase - Ignored Invoice Line,Einkauf - Ignorierte Rechnungsposition,0
diff --git a/fr_FR.csv b/fr_FR.csv
index c311719..3d4077a 100644
--- a/fr_FR.csv
+++ b/fr_FR.csv
@@ -1,12 +1,12 @@
type,name,res_id,src,value,fuzzy
error,account.invoice.line,0,You can not delete invoice lines that comes from a purchase!,Vous ne pouvez pas supprimer des lignes de facture qui viennent d'un achat !,0
+field,"purchase.purchase,invoice_lines",0,Invoice Lines,Lignes de facture,0
+field,"purchase.purchase,invoice_lines_ignored",0,Invoice Lines Ignored,Lignes de facture ignorées,0
field,"purchase.purchase-account.invoice.line,line",0,Invoice Line,Ligne de facture,0
field,"purchase.purchase-account.invoice.line,purchase",0,Purchase,Achat,0
field,"purchase.purchase-account.invoice.line,rec_name",0,Name,Nom,0
field,"purchase.purchase-ignored-account.invoice.line,invoice",0,Invoice Line,Ligne de facture,0
field,"purchase.purchase-ignored-account.invoice.line,purchase",0,Purchase,Achat,0
field,"purchase.purchase-ignored-account.invoice.line,rec_name",0,Name,Nom,0
-field,"purchase.purchase,invoice_lines",0,Invoice Lines,Lignes de facture,0
-field,"purchase.purchase,invoice_lines_ignored",0,Invoice Lines Ignored,Lignes de facture ignorées,0
model,"purchase.purchase-account.invoice.line,name",0,Purchase - Invoice Line,Achat - Ligne de facture,0
model,"purchase.purchase-ignored-account.invoice.line,name",0,Purchase - Ignored Invoice Line,Achat - Ligne de facture ignorée,0
diff --git a/invoice.py b/invoice.py
index 5c6e7b3..3d90a0d 100644
--- a/invoice.py
+++ b/invoice.py
@@ -1,27 +1,25 @@
#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 ModelView, ModelSQL, fields
+from trytond.transaction import Transaction
class Invoice(ModelSQL, ModelView):
_name = 'account.invoice'
- def write(self, cursor, user, ids, vals, context=None):
+ def write(self, ids, vals):
invoice_line_obj = self.pool.get('account.invoice.line')
purchase_obj = self.pool.get('purchase.purchase')
- res = super(Invoice, self).write(cursor, user, ids, vals,
- context=context)
+ res = super(Invoice, self).write(ids, vals)
if 'state' in vals and vals['state'] in ('paid', 'cancel'):
if isinstance(ids, (int, long)):
ids = [ids]
- purchase_ids = purchase_obj.search(cursor, user, [
+ purchase_ids = purchase_obj.search([
('invoices', 'in', ids),
- ], context=context)
- for purchase in purchase_obj.browse(cursor, user, purchase_ids,
- context=context):
- invoice_line_obj.workflow_trigger_trigger(cursor, user,
- [x.id for x in purchase.invoice_lines],
- context=context)
+ ])
+ for purchase in purchase_obj.browse(purchase_ids):
+ invoice_line_obj.workflow_trigger_trigger(
+ [x.id for x in purchase.invoice_lines])
return res
Invoice()
@@ -37,23 +35,22 @@ class InvoiceLine(ModelSQL, ModelView):
'invoice lines that comes from a purchase!',
})
- def write(self, cursor, user, ids, vals, context=None):
+ def write(self, ids, vals):
purchase_obj = self.pool.get('purchase.purchase')
if 'invoice' in vals:
if isinstance(ids, (int, long)):
ids = [ids]
- purchase_ids = purchase_obj.search(cursor, user, [
+ purchase_ids = purchase_obj.search([
('invoice_lines', 'in', ids),
- ], context=context)
+ ])
if vals['invoice']:
- purchase_obj.write(cursor, user, purchase_ids, {
+ purchase_obj.write(purchase_ids, {
'invoices': [('add', vals['invoice'])],
- }, context=context)
+ })
else:
- purchases = purchase_obj.browse(cursor, user, purchase_ids,
- context=context)
+ purchases = purchase_obj.browse(purchase_ids)
for purchase in purchases:
invoice_ids = list(set([x.invoice.id for x \
in purchase.invoice_lines \
@@ -61,14 +58,14 @@ class InvoiceLine(ModelSQL, ModelView):
set([x.invoice.id for x \
in purchase.invoice_lines \
if x.invoice and x.id not in ids]))
- purchase_obj.write(cursor, user, purchase.id, {
+ purchase_obj.write(purchase.id, {
'invoices': [('unlink', invoice_ids)],
- }, 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):
+ cursor = Transaction().cursor
if not ids:
return True
if isinstance(ids, (int, long)):
@@ -77,9 +74,7 @@ class InvoiceLine(ModelSQL, ModelView):
'WHERE line IN (' + ','.join(['%s' for x in ids]) + ')',
ids)
if cursor.rowcount:
- self.raise_user_error(cursor, 'delete_purchase_invoice_line',
- context=context)
- return super(InvoiceLine, self).delete(cursor, user, ids,
- context=context)
+ self.raise_user_error('delete_purchase_invoice_line')
+ return super(InvoiceLine, self).delete(ids)
InvoiceLine()
diff --git a/purchase.py b/purchase.py
index 29d32ed..52fdd03 100644
--- a/purchase.py
+++ b/purchase.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.
+from __future__ import with_statement
from trytond.model import ModelView, ModelSQL, fields
-
+from trytond.transaction import Transaction
class Purchase(ModelSQL, ModelView):
_name = 'purchase.purchase'
@@ -12,51 +13,45 @@ class Purchase(ModelSQL, ModelView):
'purchase.purchase-ignored-account.invoice.line',
'purchase', 'invoice', 'Invoice Lines Ignored', readonly=True)
- def init(self, cursor, module_name):
+ def init(self, module_name):
+ cursor = Transaction().cursor
# Migration from 1.2: packing renamed into shipment
cursor.execute("UPDATE ir_model_data "\
"SET fs_id = REPLACE(fs_id, 'packing', 'shipment') "\
"WHERE fs_id like '%%packing%%' "\
"AND module = %s", (module_name,))
- super(Purchase, self).init(cursor, module_name)
+ super(Purchase, self).init(module_name)
- def create_invoice(self, cursor, user, purchase_id, context=None):
+ def create_invoice(self, purchase_id):
invoice_obj = self.pool.get('account.invoice')
invoice_line_obj = self.pool.get('account.invoice.line')
- res = super(Purchase, self).create_invoice(cursor, user, purchase_id,
- context=context)
+ res = super(Purchase, self).create_invoice(purchase_id)
if res:
- if context is None:
- context = {}
-
- ctx = context.copy()
- ctx['user'] = user
-
- invoice = invoice_obj.browse(cursor, user, res, context=context)
+ invoice = invoice_obj.browse(res)
line_ids = [x.id for x in invoice.lines]
- invoice_line_obj.write(cursor, 0, line_ids, {
- 'invoice': False,
- 'invoice_type': invoice.type,
- 'party': invoice.party,
- 'currency': invoice.currency.id,
- 'company': invoice.company.id,
- }, context=ctx)
- self.write(cursor, user, purchase_id, {
+ with Transaction().set_user(0, set_context=True):
+ invoice_line_obj.write(line_ids, {
+ 'invoice': False,
+ 'invoice_type': invoice.type,
+ 'party': invoice.party,
+ 'currency': invoice.currency.id,
+ 'company': invoice.company.id,
+ })
+ self.write(purchase_id, {
'invoices': [('unlink', res)],
'invoice_lines': [('add', line_ids)],
- }, context=context)
- invoice_obj.workflow_trigger_validate(cursor, 0, res,
- 'cancel', context=ctx)
- invoice_obj.delete(cursor, 0, res, context=ctx)
+ })
+ with Transaction().set_user(0, set_context=True):
+ invoice_obj.workflow_trigger_validate(res, 'cancel')
+ invoice_obj.delete(res)
res = None
return res
- def get_invoice_paid(self, cursor, user, purchases, context=None):
- res = super(Purchase, self).get_invoice_paid(cursor, user, purchases,
- context=context)
+ def get_invoice_paid(self, purchases):
+ res = super(Purchase, self).get_invoice_paid(purchases)
for purchase in purchases:
val = True
ignored_ids = [x.id for x in purchase.invoice_lines_ignored]
@@ -71,9 +66,8 @@ class Purchase(ModelSQL, ModelView):
res[purchase.id] = val
return res
- def get_invoice_exception(self, cursor, user, purchases, context=None):
- res = super(Purchase, self).get_invoice_exception(cursor, user,
- purchases, context=context)
+ def get_invoice_exception(self, purchases):
+ res = super(Purchase, self).get_invoice_exception(purchases)
for purchase in purchases:
val = False
@@ -87,28 +81,26 @@ class Purchase(ModelSQL, ModelView):
res[purchase.id] = val
return res
- def copy(self, cursor, user, ids, default=None, context=None):
+ def copy(self, ids, default=None):
if default is None:
default = {}
default = default.copy()
default['invoice_lines'] = False
default['invoice_lines_ignored'] = False
- return super(Purchase, self).copy(cursor, user, ids, default=default,
- context=context)
+ return super(Purchase, self).copy(ids, default=default)
- def ignore_invoice_exception(self, cursor, user, purchase_id, context=None):
- super(Purchase, self).ignore_invoice_exception(cursor, user, purchase_id,
- context=context)
- purchase = self.browse(cursor, user, purchase_id, context=context)
+ def ignore_invoice_exception(self, purchase_id):
+ super(Purchase, self).ignore_invoice_exception(purchase_id)
+ purchase = self.browse(purchase_id)
invoice_line_ids = []
for invoice_line in purchase.invoice_lines:
if invoice_line.invoice \
and invoice_line.invoice.state == 'cancel':
invoice_line_ids.append(invoice_line.id)
if invoice_line_ids:
- self.write(cursor, user, purchase_id, {
+ self.write(purchase_id, {
'invoice_lines_ignored': [('add', x) for x in invoice_line_ids],
- }, context=context)
+ })
Purchase()
diff --git a/tests/test_purchase_invoice_line_standalone.py b/tests/test_purchase_invoice_line_standalone.py
index 23dd302..a152a37 100644
--- a/tests/test_purchase_invoice_line_standalone.py
+++ b/tests/test_purchase_invoice_line_standalone.py
@@ -26,8 +26,7 @@ class PurchaseInvoiceLineStandaloneTestCase(unittest.TestCase):
'''
Test views.
'''
- self.assertRaises(Exception, test_view(
- 'purchase_invoice_line_standalone'))
+ test_view('purchase_invoice_line_standalone')
def suite():
suite = trytond.tests.test_tryton.suite()
diff --git a/trytond_purchase_invoice_line_standalone.egg-info/PKG-INFO b/trytond_purchase_invoice_line_standalone.egg-info/PKG-INFO
index 04ce103..6316cd2 100644
--- a/trytond_purchase_invoice_line_standalone.egg-info/PKG-INFO
+++ b/trytond_purchase_invoice_line_standalone.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-purchase-invoice-line-standalone
-Version: 1.6.0
+Version: 1.8.0
Summary:
Change the purchase order behaviour to create standalone invoice lines instead of a
complete invoice. This allow to compose invoices with lines originating
@@ -10,7 +10,7 @@ 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_purchase_invoice_line_standalone.egg-info/requires.txt b/trytond_purchase_invoice_line_standalone.egg-info/requires.txt
index cd9aed6..f08a1a2 100644
--- a/trytond_purchase_invoice_line_standalone.egg-info/requires.txt
+++ b/trytond_purchase_invoice_line_standalone.egg-info/requires.txt
@@ -1,3 +1,3 @@
-trytond_purchase >= 1.6, < 1.7
-trytond_account_invoice_line_standalone >= 1.6, < 1.7
-trytond >= 1.6, < 1.7
\ No newline at end of file
+trytond_purchase >= 1.8, < 1.9
+trytond_account_invoice_line_standalone >= 1.8, < 1.9
+trytond >= 1.8, < 1.9
\ No newline at end of file
commit 4fb1a667d4ea71145bc33b99f4fa264b5f4a33cb
Author: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Date: Thu May 13 20:41:40 2010 +0200
Adding upstream version 1.6.0.
diff --git a/CHANGELOG b/CHANGELOG
index 2dfa19c..95c8625 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 45375dc..636d9f8 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_purchase_invoice_line_standalone
-Version: 1.4.0
+Version: 1.6.0
Summary:
Change the purchase order behaviour to create standalone invoice lines instead of a
complete invoice. This allow to compose invoices with lines originating
@@ -10,7 +10,7 @@ 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 bc54e3b..82339ce 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -6,7 +6,7 @@
"name_es_CO" : "Línea de Factura autónoma en Compras",
"name_es_ES" : "Línea de factura de compra independiente",
"name_fr_FR" : "Ligne de facture autonome - Achat",
- "version" : "1.4.0",
+ "version" : "1.6.0",
"author" : "B2CK",
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/setup.py b/setup.py
index 2695065..d4286c7 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_purchase_invoice_line_standalone',
version=info.get('version', '0.0.1'),
@@ -27,6 +30,7 @@ setup(name='trytond_purchase_invoice_line_standalone',
package_dir={'trytond.modules.purchase_invoice_line_standalone': '.'},
packages=[
'trytond.modules.purchase_invoice_line_standalone',
+ 'trytond.modules.purchase_invoice_line_standalone.tests',
],
package_data={
'trytond.modules.purchase_invoice_line_standalone': info.get('xml', []) \
@@ -54,4 +58,6 @@ setup(name='trytond_purchase_invoice_line_standalone',
[trytond.modules]
purchase_invoice_line_standalone = trytond.modules.purchase_invoice_line_standalone
""",
+ test_suite='tests',
+ test_loader='trytond.test_loader:Loader',
)
diff --git a/tests/__init__.py b/tests/__init__.py
index a0d06ef..e703636 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_purchase_invoice_line_standalone import *
+from test_purchase_invoice_line_standalone import suite
diff --git a/tests/test_purchase_invoice_line_standalone.py b/tests/test_purchase_invoice_line_standalone.py
index 5fdc30e..23dd302 100644
--- a/tests/test_purchase_invoice_line_standalone.py
+++ b/tests/test_purchase_invoice_line_standalone.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 PurchaseInvoiceLineStandaloneTestCase(unittest.TestCase):
@@ -30,13 +30,10 @@ class PurchaseInvoiceLineStandaloneTestCase(unittest.TestCase):
'purchase_invoice_line_standalone'))
def suite():
- return unittest.TestLoader().loadTestsFromTestCase(
- PurchaseInvoiceLineStandaloneTestCase)
+ suite = trytond.tests.test_tryton.suite()
+ suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
+ PurchaseInvoiceLineStandaloneTestCase))
+ return suite
if __name__ == '__main__':
- suiteTrytond = trytond.tests.test_tryton.suite()
- suitePurchaseInvoiceLineStandalone = suite()
- alltests = unittest.TestSuite([suiteTrytond,
- suitePurchaseInvoiceLineStandalone])
- unittest.TextTestRunner(verbosity=2).run(alltests)
- SOCK.disconnect()
+ unittest.TextTestRunner(verbosity=2).run(suite())
diff --git a/trytond_purchase_invoice_line_standalone.egg-info/PKG-INFO b/trytond_purchase_invoice_line_standalone.egg-info/PKG-INFO
index e066c71..04ce103 100644
--- a/trytond_purchase_invoice_line_standalone.egg-info/PKG-INFO
+++ b/trytond_purchase_invoice_line_standalone.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-purchase-invoice-line-standalone
-Version: 1.4.0
+Version: 1.6.0
Summary:
Change the purchase order behaviour to create standalone invoice lines instead of a
complete invoice. This allow to compose invoices with lines originating
@@ -10,7 +10,7 @@ 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_purchase_invoice_line_standalone.egg-info/SOURCES.txt b/trytond_purchase_invoice_line_standalone.egg-info/SOURCES.txt
index ff2f01a..f630e04 100644
--- a/trytond_purchase_invoice_line_standalone.egg-info/SOURCES.txt
+++ b/trytond_purchase_invoice_line_standalone.egg-info/SOURCES.txt
@@ -14,8 +14,8 @@ setup.py
./__tryton__.py
./invoice.py
./purchase.py
-tests/__init__.py
-tests/test_purchase_invoice_line_standalone.py
+./tests/__init__.py
+./tests/test_purchase_invoice_line_standalone.py
trytond_purchase_invoice_line_standalone.egg-info/PKG-INFO
trytond_purchase_invoice_line_standalone.egg-info/SOURCES.txt
trytond_purchase_invoice_line_standalone.egg-info/dependency_links.txt
diff --git a/trytond_purchase_invoice_line_standalone.egg-info/requires.txt b/trytond_purchase_invoice_line_standalone.egg-info/requires.txt
index df6e891..cd9aed6 100644
--- a/trytond_purchase_invoice_line_standalone.egg-info/requires.txt
+++ b/trytond_purchase_invoice_line_standalone.egg-info/requires.txt
@@ -1,4 +1,3 @@
-trytond_purchase
-trytond_account_invoice_line_standalone
-trytond >= 1.4
-trytond < 1.5
\ No newline at end of file
+trytond_purchase >= 1.6, < 1.7
+trytond_account_invoice_line_standalone >= 1.6, < 1.7
+trytond >= 1.6, < 1.7
\ No newline at end of file
commit 5624af1baa3bb7565fabba2efc2b135c2222bc39
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Oct 19 22:24:15 2009 +0200
Adding upstream version 1.4.0.
diff --git a/CHANGELOG b/CHANGELOG
index e5d2284..2dfa19c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,2 +1,5 @@
+Version 1.4.0 - 2009-10-19
+* Bug fixes (see mercurial logs for details)
+
Version 1.2.0 - 2009-09-08
* Initial release
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 f7bce8a..45375dc 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_purchase_invoice_line_standalone
-Version: 1.2.0
+Version: 1.4.0
Summary:
Change the purchase order behaviour to create standalone invoice lines instead of a
complete invoice. This allow to compose invoices with lines originating
@@ -10,7 +10,7 @@ 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/__tryton__.py b/__tryton__.py
index a447347..bc54e3b 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -3,10 +3,10 @@
{
"name" : "Purchase Invoice Line Standalone",
"name_de_DE" : "Einkauf ungebundene Rechnungsposition",
- "name_fr_FR" : "Ligne de facture autonome - Achat",
"name_es_CO" : "Línea de Factura autónoma en Compras",
- "name_es_ES" : "Línea de factura independiente de compra",
- "version" : "1.2.0",
+ "name_es_ES" : "Línea de factura de compra independiente",
+ "name_fr_FR" : "Ligne de facture autonome - Achat",
+ "version" : "1.4.0",
"author" : "B2CK",
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
@@ -21,10 +21,6 @@ from differents purchases.
- Ermöglicht die Zusammenstellung von Rechnungen aus Einkaufspositionen
verschiedener Einkäufe.
''',
- "description_fr_FR": '''Modifie le comportement de l'ordre d'achat pour créer des lignes de
-facture autonomes au lieu de factures complètes. Cela permet de
-composer des factures avec des lignes provenant de différents achats.
-''',
"description_es_CO": '''Modifica el comportamiento de orden de compra permitiendo crear
líneas autónomas en lugar de una factura completa. Permite componer facturas con
líneas originadas en diferentes compras.
@@ -34,6 +30,10 @@ Modifica el comportamiento de orden de compra permitiendo crear líneas
independientes en lugar de una factura completa. Esto permite componer
facturas con líneas originadas en diferentes compras.
''',
+ "description_fr_FR": '''Modifie le comportement de l'ordre d'achat pour créer des lignes de
+facture autonomes au lieu de factures complètes. Cela permet de
+composer des factures avec des lignes provenant de différents achats.
+''',
"depends" : [
"ir",
"purchase",
@@ -44,8 +44,8 @@ facturas con líneas originadas en diferentes compras.
],
'translation': [
'de_DE.csv',
- 'fr_FR.csv',
'es_CO.csv',
'es_ES.csv',
+ 'fr_FR.csv',
],
}
diff --git a/es_ES.csv b/es_ES.csv
index af86c11..f86dc79 100644
--- a/es_ES.csv
+++ b/es_ES.csv
@@ -1,12 +1,12 @@
type,name,res_id,src,value,fuzzy
-error,account.invoice.line,0,You can not delete invoice lines that comes from a purchase!,No puede eliminar líneas que vienen de una compra,0
+error,account.invoice.line,0,You can not delete invoice lines that comes from a purchase!,No puede borrar líneas que vienen de una compra,0
field,"purchase.purchase-account.invoice.line,line",0,Invoice Line,Línea de factura,0
field,"purchase.purchase-account.invoice.line,purchase",0,Purchase,Compra,0
field,"purchase.purchase-account.invoice.line,rec_name",0,Name,Nombre,0
field,"purchase.purchase-ignored-account.invoice.line,invoice",0,Invoice Line,Línea de factura,0
field,"purchase.purchase-ignored-account.invoice.line,purchase",0,Purchase,Compra,0
field,"purchase.purchase-ignored-account.invoice.line,rec_name",0,Name,Nombre,0
-field,"purchase.purchase,invoice_lines",0,Invoice Lines,Líneas de Factura,0
+field,"purchase.purchase,invoice_lines",0,Invoice Lines,Líneas de factura,0
field,"purchase.purchase,invoice_lines_ignored",0,Invoice Lines Ignored,Líneas de factura ignoradas,0
model,"purchase.purchase-account.invoice.line,name",0,Purchase - Invoice Line,Compra - Línea de factura,0
model,"purchase.purchase-ignored-account.invoice.line,name",0,Purchase - Ignored Invoice Line,Compra - Línea de factura ignorada,0
diff --git a/fr_FR.csv b/fr_FR.csv
index 8a807a8..c311719 100644
--- a/fr_FR.csv
+++ b/fr_FR.csv
@@ -1,9 +1,9 @@
type,name,res_id,src,value,fuzzy
error,account.invoice.line,0,You can not delete invoice lines that comes from a purchase!,Vous ne pouvez pas supprimer des lignes de facture qui viennent d'un achat !,0
-field,"purchase.purchase-account.invoice.line,line",0,Invoice Line,Ligne de Facture,0
+field,"purchase.purchase-account.invoice.line,line",0,Invoice Line,Ligne de facture,0
field,"purchase.purchase-account.invoice.line,purchase",0,Purchase,Achat,0
field,"purchase.purchase-account.invoice.line,rec_name",0,Name,Nom,0
-field,"purchase.purchase-ignored-account.invoice.line,invoice",0,Invoice Line,Ligne de Facture,0
+field,"purchase.purchase-ignored-account.invoice.line,invoice",0,Invoice Line,Ligne de facture,0
field,"purchase.purchase-ignored-account.invoice.line,purchase",0,Purchase,Achat,0
field,"purchase.purchase-ignored-account.invoice.line,rec_name",0,Name,Nom,0
field,"purchase.purchase,invoice_lines",0,Invoice Lines,Lignes de facture,0
diff --git a/purchase.py b/purchase.py
index 43a2852..29d32ed 100644
--- a/purchase.py
+++ b/purchase.py
@@ -12,6 +12,15 @@ class Purchase(ModelSQL, ModelView):
'purchase.purchase-ignored-account.invoice.line',
'purchase', 'invoice', 'Invoice Lines Ignored', readonly=True)
+ def init(self, cursor, module_name):
+ # Migration from 1.2: packing renamed into shipment
+ cursor.execute("UPDATE ir_model_data "\
+ "SET fs_id = REPLACE(fs_id, 'packing', 'shipment') "\
+ "WHERE fs_id like '%%packing%%' "\
+ "AND module = %s", (module_name,))
+
+ super(Purchase, self).init(cursor, module_name)
+
def create_invoice(self, cursor, user, purchase_id, context=None):
invoice_obj = self.pool.get('account.invoice')
invoice_line_obj = self.pool.get('account.invoice.line')
diff --git a/purchase.xml b/purchase.xml
index 4898a44..c562f3b 100644
--- a/purchase.xml
+++ b/purchase.xml
@@ -32,11 +32,11 @@ this repository contains the full copyright notices and license terms. -->
</record>
<record model="workflow.transition"
- id="purchase_transition_waiting_invoice_packing_invoice_packing_done">
+ id="purchase_transition_waiting_invoice_shipment_invoice_shipment_done">
<field name="act_from"
- ref="purchase.purchase_activity_waiting_invoice_packing"/>
+ ref="purchase.purchase_activity_waiting_invoice_shipment"/>
<field name="act_to"
- ref="purchase.purchase_activity_invoice_packing_done"/>
+ ref="purchase.purchase_activity_invoice_shipment_done"/>
<field name="trigger_model">account.invoice.line</field>
<field name="trigger_expr_id">[x.id for x in invoice_lines]</field>
<field name="condition">invoice_paid</field>
diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 0000000..a0d06ef
--- /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_purchase_invoice_line_standalone import *
diff --git a/tests/test_purchase_invoice_line_standalone.py b/tests/test_purchase_invoice_line_standalone.py
new file mode 100644
index 0000000..5fdc30e
--- /dev/null
+++ b/tests/test_purchase_invoice_line_standalone.py
@@ -0,0 +1,42 @@
+#!/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 PurchaseInvoiceLineStandaloneTestCase(unittest.TestCase):
+ '''
+ Test PurchaseInvoiceLineStandalone module.
+ '''
+
+ def setUp(self):
+ trytond.tests.test_tryton.install_module(
+ 'purchase_invoice_line_standalone')
+
+ def test0005views(self):
+ '''
+ Test views.
+ '''
+ self.assertRaises(Exception, test_view(
+ 'purchase_invoice_line_standalone'))
+
+def suite():
+ return unittest.TestLoader().loadTestsFromTestCase(
+ PurchaseInvoiceLineStandaloneTestCase)
+
+if __name__ == '__main__':
+ suiteTrytond = trytond.tests.test_tryton.suite()
+ suitePurchaseInvoiceLineStandalone = suite()
+ alltests = unittest.TestSuite([suiteTrytond,
+ suitePurchaseInvoiceLineStandalone])
+ unittest.TextTestRunner(verbosity=2).run(alltests)
+ SOCK.disconnect()
diff --git a/trytond_purchase_invoice_line_standalone.egg-info/PKG-INFO b/trytond_purchase_invoice_line_standalone.egg-info/PKG-INFO
index bac08e4..e066c71 100644
--- a/trytond_purchase_invoice_line_standalone.egg-info/PKG-INFO
+++ b/trytond_purchase_invoice_line_standalone.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-purchase-invoice-line-standalone
-Version: 1.2.0
+Version: 1.4.0
Summary:
Change the purchase order behaviour to create standalone invoice lines instead of a
complete invoice. This allow to compose invoices with lines originating
@@ -10,7 +10,7 @@ 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_purchase_invoice_line_standalone.egg-info/SOURCES.txt b/trytond_purchase_invoice_line_standalone.egg-info/SOURCES.txt
index 218459e..ff2f01a 100644
--- a/trytond_purchase_invoice_line_standalone.egg-info/SOURCES.txt
+++ b/trytond_purchase_invoice_line_standalone.egg-info/SOURCES.txt
@@ -14,6 +14,8 @@ setup.py
./__tryton__.py
./invoice.py
./purchase.py
+tests/__init__.py
+tests/test_purchase_invoice_line_standalone.py
trytond_purchase_invoice_line_standalone.egg-info/PKG-INFO
trytond_purchase_invoice_line_standalone.egg-info/SOURCES.txt
trytond_purchase_invoice_line_standalone.egg-info/dependency_links.txt
diff --git a/trytond_purchase_invoice_line_standalone.egg-info/requires.txt b/trytond_purchase_invoice_line_standalone.egg-info/requires.txt
index 456406a..df6e891 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 @@
trytond_purchase
trytond_account_invoice_line_standalone
-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 1abce27181a0ad62f0250e78d7474838f26e8c06
Author: Daniel Baumann <daniel at debian.org>
Date: Fri Sep 11 08:28:42 2009 +0200
Adding upstream version 1.2.0.
diff --git a/CHANGELOG b/CHANGELOG
new file mode 100644
index 0000000..e5d2284
--- /dev/null
+++ b/CHANGELOG
@@ -0,0 +1,2 @@
+Version 1.2.0 - 2009-09-08
+* Initial release
diff --git a/COPYRIGHT b/COPYRIGHT
new file mode 100644
index 0000000..853f1f7
--- /dev/null
+++ b/COPYRIGHT
@@ -0,0 +1,15 @@
+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
+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..7cfad9a
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,31 @@
+Installing trytond_purchase_invoice_line_standalone
+===================================================
+
+Prerequisites
+-------------
+
+ * Python 2.4 or later (http://www.python.org/)
+ * trytond 0.0.x (http://www.tryton.org/)
+ * trytond_purchase (http://www.tryton.org/)
+ * trytond_account_invoice_line_standalone (http://www.tryton.org/)
+
+Installation
+------------
+
+Once you've downloaded and unpacked a trytond_purchase_invoice_line_standalone 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 product_purchase_invoice_line_standalone.
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..f7bce8a
--- /dev/null
+++ b/PKG-INFO
@@ -0,0 +1,28 @@
+Metadata-Version: 1.0
+Name: trytond_purchase_invoice_line_standalone
+Version: 1.2.0
+Summary:
+Change the purchase order behaviour to create standalone invoice lines instead of a
+complete invoice. This allow to compose invoices with lines originating
+from differents purchases.
+
+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/
+Description: UNKNOWN
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Plugins
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Legal Industry
+Classifier: Intended Audience :: Manufacturing
+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
diff --git a/README b/README
new file mode 100644
index 0000000..e3e3961
--- /dev/null
+++ b/README
@@ -0,0 +1,36 @@
+trytond_purchase_invoice_line_standalone
+=======================================
+
+The account_purchase_line_standalone 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..907d04b
--- /dev/null
+++ b/__init__.py
@@ -0,0 +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.
+
+from purchase import *
+from invoice import *
diff --git a/__tryton__.py b/__tryton__.py
new file mode 100644
index 0000000..a447347
--- /dev/null
+++ b/__tryton__.py
@@ -0,0 +1,51 @@
+#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" : "Purchase Invoice Line Standalone",
+ "name_de_DE" : "Einkauf ungebundene Rechnungsposition",
+ "name_fr_FR" : "Ligne de facture autonome - Achat",
+ "name_es_CO" : "Línea de Factura autónoma en Compras",
+ "name_es_ES" : "Línea de factura independiente de compra",
+ "version" : "1.2.0",
+ "author" : "B2CK",
+ 'email': 'info at b2ck.com',
+ 'website': 'http://www.tryton.org/',
+ "description": '''
+Change the purchase order behaviour to create standalone invoice lines instead of a
+complete invoice. This allow to compose invoices with lines originating
+from differents purchases.
+''',
+ "description_de_DE": '''Einkäufe mit ungebundenen Rechnungspositionen
+ - Ändert das Verhalten im Einkaufsvorgang, indem unabhängige Rechnungspositionen
+ an Stelle einer kompletten Rechnung erstellt werden.
+ - Ermöglicht die Zusammenstellung von Rechnungen aus Einkaufspositionen
+ verschiedener Einkäufe.
+''',
+ "description_fr_FR": '''Modifie le comportement de l'ordre d'achat pour créer des lignes de
+facture autonomes au lieu de factures complètes. Cela permet de
+composer des factures avec des lignes provenant de différents achats.
+''',
+ "description_es_CO": '''Modifica el comportamiento de orden de compra permitiendo crear
+líneas autónomas en lugar de una factura completa. Permite componer facturas con
+líneas originadas en diferentes compras.
+''',
+ "description_es_ES": '''
+Modifica el comportamiento de orden de compra permitiendo crear líneas
+independientes en lugar de una factura completa. Esto permite componer
+facturas con líneas originadas en diferentes compras.
+''',
+ "depends" : [
+ "ir",
+ "purchase",
+ "account_invoice_line_standalone",
+ ],
+ "xml" : [
+ "purchase.xml",
+ ],
+ 'translation': [
+ 'de_DE.csv',
+ 'fr_FR.csv',
+ 'es_CO.csv',
+ 'es_ES.csv',
+ ],
+}
diff --git a/de_DE.csv b/de_DE.csv
new file mode 100644
index 0000000..dc982bd
--- /dev/null
+++ b/de_DE.csv
@@ -0,0 +1,12 @@
+type,name,res_id,src,value,fuzzy
+error,account.invoice.line,0,You can not delete invoice lines that comes from a purchase!,Aus einem Einkauf stammende Rechnungspositionen können nicht gelöscht werden!,0
+field,"purchase.purchase-account.invoice.line,line",0,Invoice Line,Rechnungsposition Kunde,0
+field,"purchase.purchase-account.invoice.line,purchase",0,Purchase,Einkauf,0
+field,"purchase.purchase-account.invoice.line,rec_name",0,Name,Name,0
+field,"purchase.purchase-ignored-account.invoice.line,invoice",0,Invoice Line,Rechnungsposition Kunde,0
+field,"purchase.purchase-ignored-account.invoice.line,purchase",0,Purchase,Einkauf,0
+field,"purchase.purchase-ignored-account.invoice.line,rec_name",0,Name,Name,0
+field,"purchase.purchase,invoice_lines",0,Invoice Lines,Rechnungspositionen Kunden,0
+field,"purchase.purchase,invoice_lines_ignored",0,Invoice Lines Ignored,Ignorierte Rechnungspositionen,0
+model,"purchase.purchase-account.invoice.line,name",0,Purchase - Invoice Line,Einkauf - Rechnungsposition,0
+model,"purchase.purchase-ignored-account.invoice.line,name",0,Purchase - Ignored Invoice Line,Einkauf - Ignorierte Rechnungsposition,0
diff --git a/es_CO.csv b/es_CO.csv
new file mode 100644
index 0000000..0da92d0
--- /dev/null
+++ b/es_CO.csv
@@ -0,0 +1,12 @@
+type,name,res_id,src,value,fuzzy
+error,account.invoice.line,0,You can not delete invoice lines that comes from a purchase!,¡No puede eliminar líneas que vienen de una compra!,0
+field,"purchase.purchase-account.invoice.line,line",0,Invoice Line,Línea de Factura,0
+field,"purchase.purchase-account.invoice.line,purchase",0,Purchase,Compras,0
+field,"purchase.purchase-account.invoice.line,rec_name",0,Name,Nombre,0
+field,"purchase.purchase-ignored-account.invoice.line,invoice",0,Invoice Line,Línea de Factura,0
+field,"purchase.purchase-ignored-account.invoice.line,purchase",0,Purchase,Compras,0
+field,"purchase.purchase-ignored-account.invoice.line,rec_name",0,Name,Nombre,0
+field,"purchase.purchase,invoice_lines",0,Invoice Lines,Líneas de Factura,0
+field,"purchase.purchase,invoice_lines_ignored",0,Invoice Lines Ignored,Líneas de Factura ignoradas,0
+model,"purchase.purchase-account.invoice.line,name",0,Purchase - Invoice Line,Compras - Línea de Factura,0
+model,"purchase.purchase-ignored-account.invoice.line,name",0,Purchase - Ignored Invoice Line,Compras - Línea de Factura ignorada,0
diff --git a/es_ES.csv b/es_ES.csv
new file mode 100644
index 0000000..af86c11
--- /dev/null
+++ b/es_ES.csv
@@ -0,0 +1,12 @@
+type,name,res_id,src,value,fuzzy
+error,account.invoice.line,0,You can not delete invoice lines that comes from a purchase!,No puede eliminar líneas que vienen de una compra,0
+field,"purchase.purchase-account.invoice.line,line",0,Invoice Line,Línea de factura,0
+field,"purchase.purchase-account.invoice.line,purchase",0,Purchase,Compra,0
+field,"purchase.purchase-account.invoice.line,rec_name",0,Name,Nombre,0
+field,"purchase.purchase-ignored-account.invoice.line,invoice",0,Invoice Line,Línea de factura,0
+field,"purchase.purchase-ignored-account.invoice.line,purchase",0,Purchase,Compra,0
+field,"purchase.purchase-ignored-account.invoice.line,rec_name",0,Name,Nombre,0
+field,"purchase.purchase,invoice_lines",0,Invoice Lines,Líneas de Factura,0
+field,"purchase.purchase,invoice_lines_ignored",0,Invoice Lines Ignored,Líneas de factura ignoradas,0
+model,"purchase.purchase-account.invoice.line,name",0,Purchase - Invoice Line,Compra - Línea de factura,0
+model,"purchase.purchase-ignored-account.invoice.line,name",0,Purchase - Ignored Invoice Line,Compra - Línea de factura ignorada,0
diff --git a/fr_FR.csv b/fr_FR.csv
new file mode 100644
index 0000000..8a807a8
--- /dev/null
+++ b/fr_FR.csv
@@ -0,0 +1,12 @@
+type,name,res_id,src,value,fuzzy
+error,account.invoice.line,0,You can not delete invoice lines that comes from a purchase!,Vous ne pouvez pas supprimer des lignes de facture qui viennent d'un achat !,0
+field,"purchase.purchase-account.invoice.line,line",0,Invoice Line,Ligne de Facture,0
+field,"purchase.purchase-account.invoice.line,purchase",0,Purchase,Achat,0
+field,"purchase.purchase-account.invoice.line,rec_name",0,Name,Nom,0
+field,"purchase.purchase-ignored-account.invoice.line,invoice",0,Invoice Line,Ligne de Facture,0
+field,"purchase.purchase-ignored-account.invoice.line,purchase",0,Purchase,Achat,0
+field,"purchase.purchase-ignored-account.invoice.line,rec_name",0,Name,Nom,0
+field,"purchase.purchase,invoice_lines",0,Invoice Lines,Lignes de facture,0
+field,"purchase.purchase,invoice_lines_ignored",0,Invoice Lines Ignored,Lignes de facture ignorées,0
+model,"purchase.purchase-account.invoice.line,name",0,Purchase - Invoice Line,Achat - Ligne de facture,0
+model,"purchase.purchase-ignored-account.invoice.line,name",0,Purchase - Ignored Invoice Line,Achat - Ligne de facture ignorée,0
diff --git a/invoice.py b/invoice.py
new file mode 100644
index 0000000..5c6e7b3
--- /dev/null
+++ b/invoice.py
@@ -0,0 +1,85 @@
+#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 ModelView, ModelSQL, fields
+
+
+class Invoice(ModelSQL, ModelView):
+ _name = 'account.invoice'
+
+ def write(self, cursor, user, ids, vals, context=None):
+ invoice_line_obj = self.pool.get('account.invoice.line')
+ purchase_obj = self.pool.get('purchase.purchase')
+ res = super(Invoice, self).write(cursor, user, ids, vals,
+ context=context)
+ if 'state' in vals and vals['state'] in ('paid', 'cancel'):
+ if isinstance(ids, (int, long)):
+ ids = [ids]
+ purchase_ids = purchase_obj.search(cursor, user, [
+ ('invoices', 'in', ids),
+ ], context=context)
+ for purchase in purchase_obj.browse(cursor, user, purchase_ids,
+ context=context):
+ invoice_line_obj.workflow_trigger_trigger(cursor, user,
+ [x.id for x in purchase.invoice_lines],
+ context=context)
+ return res
+
+Invoice()
+
+
+class InvoiceLine(ModelSQL, ModelView):
+ _name = 'account.invoice.line'
+
+ def __init__(self):
+ super(InvoiceLine, self).__init__()
+ self._error_messages.update({
+ 'delete_purchase_invoice_line': 'You can not delete ' \
+ 'invoice lines that comes from a purchase!',
+ })
+
+ def write(self, cursor, user, ids, vals, context=None):
+ purchase_obj = self.pool.get('purchase.purchase')
+
+ if 'invoice' in vals:
+ if isinstance(ids, (int, long)):
+ ids = [ids]
+
+ purchase_ids = purchase_obj.search(cursor, user, [
+ ('invoice_lines', 'in', ids),
+ ], context=context)
+ if vals['invoice']:
+ purchase_obj.write(cursor, user, purchase_ids, {
+ 'invoices': [('add', vals['invoice'])],
+ }, context=context)
+ else:
+ purchases = purchase_obj.browse(cursor, user, purchase_ids,
+ context=context)
+ for purchase in purchases:
+ invoice_ids = list(set([x.invoice.id for x \
+ in purchase.invoice_lines \
+ if x.invoice and x.id in ids]) - \
+ set([x.invoice.id for x \
+ in purchase.invoice_lines \
+ if x.invoice and x.id not in ids]))
+ purchase_obj.write(cursor, user, purchase.id, {
+ 'invoices': [('unlink', invoice_ids)],
+ }, context=context)
+
+ return super(InvoiceLine, self).write(cursor, user, ids, vals,
+ context=context)
+
+ def delete(self, cursor, user, ids, context=None):
+ if not ids:
+ return True
+ if isinstance(ids, (int, long)):
+ ids = [ids]
+ cursor.execute('SELECT id FROM purchase_invoice_line_rel ' \
+ 'WHERE line IN (' + ','.join(['%s' for x in ids]) + ')',
+ ids)
+ if cursor.rowcount:
+ self.raise_user_error(cursor, 'delete_purchase_invoice_line',
+ context=context)
+ return super(InvoiceLine, self).delete(cursor, user, ids,
+ context=context)
+
+InvoiceLine()
diff --git a/purchase.py b/purchase.py
new file mode 100644
index 0000000..43a2852
--- /dev/null
+++ b/purchase.py
@@ -0,0 +1,130 @@
+#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 ModelView, ModelSQL, fields
+
+
+class Purchase(ModelSQL, ModelView):
+ _name = 'purchase.purchase'
+
+ invoice_lines = fields.Many2Many('purchase.purchase-account.invoice.line',
+ 'purchase', 'line', 'Invoice Lines', readonly=True)
+ invoice_lines_ignored = fields.Many2Many(
+ 'purchase.purchase-ignored-account.invoice.line',
+ 'purchase', 'invoice', 'Invoice Lines Ignored', readonly=True)
+
+ def create_invoice(self, cursor, user, purchase_id, context=None):
+ invoice_obj = self.pool.get('account.invoice')
+ invoice_line_obj = self.pool.get('account.invoice.line')
+
+ res = super(Purchase, self).create_invoice(cursor, user, purchase_id,
+ context=context)
+
+ if res:
+ if context is None:
+ context = {}
+
+ ctx = context.copy()
+ ctx['user'] = user
+
+ invoice = invoice_obj.browse(cursor, user, res, context=context)
+ line_ids = [x.id for x in invoice.lines]
+ invoice_line_obj.write(cursor, 0, line_ids, {
+ 'invoice': False,
+ 'invoice_type': invoice.type,
+ 'party': invoice.party,
+ 'currency': invoice.currency.id,
+ 'company': invoice.company.id,
+ }, context=ctx)
+ self.write(cursor, user, purchase_id, {
+ 'invoices': [('unlink', res)],
+ 'invoice_lines': [('add', line_ids)],
+ }, context=context)
+ invoice_obj.workflow_trigger_validate(cursor, 0, res,
+ 'cancel', context=ctx)
+ invoice_obj.delete(cursor, 0, res, context=ctx)
+ res = None
+ return res
+
+ def get_invoice_paid(self, cursor, user, purchases, context=None):
+ res = super(Purchase, self).get_invoice_paid(cursor, user, purchases,
+ context=context)
+ for purchase in purchases:
+ val = True
+ ignored_ids = [x.id for x in purchase.invoice_lines_ignored]
+ for invoice_line in purchase.invoice_lines:
+ if not invoice_line.invoice:
+ val = False
+ break
+ if invoice_line.invoice.state != 'paid' \
+ and invoice_line.id not in ignored_ids:
+ val = False
+ break
+ res[purchase.id] = val
+ return res
+
+ def get_invoice_exception(self, cursor, user, purchases, context=None):
+ res = super(Purchase, self).get_invoice_exception(cursor, user,
+ purchases, context=context)
+
+ for purchase in purchases:
+ val = False
+ ignored_ids = [x.id for x in purchase.invoice_lines_ignored]
+ for invoice_line in purchase.invoice_lines:
+ if invoice_line.invoice \
+ and invoice_line.invoice.state == 'cancel' \
+ and invoice_line.id not in ignored_ids:
+ val = True
+ break
+ res[purchase.id] = val
+ return res
+
+ def copy(self, cursor, user, ids, default=None, context=None):
+ if default is None:
+ default = {}
+ default = default.copy()
+ default['invoice_lines'] = False
+ default['invoice_lines_ignored'] = False
+ return super(Purchase, self).copy(cursor, user, ids, default=default,
+ context=context)
+
+ def ignore_invoice_exception(self, cursor, user, purchase_id, context=None):
+ super(Purchase, self).ignore_invoice_exception(cursor, user, purchase_id,
+ context=context)
+ purchase = self.browse(cursor, user, purchase_id, context=context)
+ invoice_line_ids = []
+ for invoice_line in purchase.invoice_lines:
+ if invoice_line.invoice \
+ and invoice_line.invoice.state == 'cancel':
+ invoice_line_ids.append(invoice_line.id)
+ if invoice_line_ids:
+ self.write(cursor, user, purchase_id, {
+ 'invoice_lines_ignored': [('add', x) for x in invoice_line_ids],
+ }, context=context)
+
+Purchase()
+
+
+class PurchaseInvoiceLine(ModelSQL):
+ 'Purchase - Invoice Line'
+ _name = 'purchase.purchase-account.invoice.line'
+ _table = 'purchase_invoice_line_rel'
+ _description = __doc__
+ purchase = fields.Many2One('purchase.purchase', 'Purchase',
+ ondelete='CASCADE', select=1, required=True)
+ line = fields.Many2One('account.invoice.line', 'Invoice Line',
+ ondelete='RESTRICT', select=1, required=True)
+
+PurchaseInvoiceLine()
+
+
+class PurchaseIgnoredInvoiceLine(ModelSQL):
+ 'Purchase - Ignored Invoice Line'
+ _name = 'purchase.purchase-ignored-account.invoice.line'
+ _table = 'purchase_invoice_line_ignored_rel'
+ _description = __doc__
+ purchase = fields.Many2One('purchase.purchase', 'Purchase',
+ ondelete='CASCADE', select=1, required=True)
+ invoice = fields.Many2One('account.invoice.line', 'Invoice Line',
+ ondelete='RESTRICT', select=1, required=True)
+
+PurchaseIgnoredInvoiceLine()
diff --git a/purchase.xml b/purchase.xml
new file mode 100644
index 0000000..4898a44
--- /dev/null
+++ b/purchase.xml
@@ -0,0 +1,46 @@
+<?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="purchase_view_form">
+ <field name="model">purchase.purchase</field>
+ <field name="inherit" ref="purchase.purchase_view_form"/>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <data>
+ <xpath
+ expr="/form/notebook/page/field[@name="invoices"]"
+ position="after">
+ <separator name="invoice_lines" colspan="4"/>
+ <field name="invoice_lines" colspan="4"/>
+ </xpath>
+ </data>
+ ]]>
+ </field>
+ </record>
+
+ <record model="workflow.transition"
+ id="purchase_transition_waiting_invoice_purchase_invoice_done">
+ <field name="act_from"
+ ref="purchase.purchase_activity_waiting_invoice_purchase"/>
+ <field name="act_to"
+ ref="purchase.purchase_activity_invoice_done"/>
+ <field name="trigger_model">account.invoice.line</field>
+ <field name="trigger_expr_id">[x.id for x in invoice_lines]</field>
+ <field name="condition">invoice_paid</field>
+ </record>
+
+ <record model="workflow.transition"
+ id="purchase_transition_waiting_invoice_packing_invoice_packing_done">
+ <field name="act_from"
+ ref="purchase.purchase_activity_waiting_invoice_packing"/>
+ <field name="act_to"
+ ref="purchase.purchase_activity_invoice_packing_done"/>
+ <field name="trigger_model">account.invoice.line</field>
+ <field name="trigger_expr_id">[x.id for x in invoice_lines]</field>
+ <field name="condition">invoice_paid</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..2695065
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,57 @@
+#!/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', []):
+ 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))
+
+setup(name='trytond_purchase_invoice_line_standalone',
+ version=info.get('version', '0.0.1'),
+ description=info.get('description', ''),
+ 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.purchase_invoice_line_standalone': '.'},
+ packages=[
+ 'trytond.modules.purchase_invoice_line_standalone',
+ ],
+ package_data={
+ 'trytond.modules.purchase_invoice_line_standalone': info.get('xml', []) \
+ + info.get('translation', []),
+ },
+ classifiers=[
+ 'Development Status :: 5 - Production/Stable',
+ 'Environment :: Plugins',
+ 'Intended Audience :: Developers',
+ 'Intended Audience :: Legal Industry',
+ 'Intended Audience :: Manufacturing',
+ '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',
+ ],
+ license='GPL-3',
+ install_requires=requires,
+ zip_safe=False,
+ entry_points="""
+ [trytond.modules]
+ purchase_invoice_line_standalone = trytond.modules.purchase_invoice_line_standalone
+ """,
+)
diff --git a/trytond_purchase_invoice_line_standalone.egg-info/PKG-INFO b/trytond_purchase_invoice_line_standalone.egg-info/PKG-INFO
new file mode 100644
index 0000000..bac08e4
--- /dev/null
+++ b/trytond_purchase_invoice_line_standalone.egg-info/PKG-INFO
@@ -0,0 +1,28 @@
+Metadata-Version: 1.0
+Name: trytond-purchase-invoice-line-standalone
+Version: 1.2.0
+Summary:
+Change the purchase order behaviour to create standalone invoice lines instead of a
+complete invoice. This allow to compose invoices with lines originating
+from differents purchases.
+
+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/
+Description: UNKNOWN
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Plugins
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Legal Industry
+Classifier: Intended Audience :: Manufacturing
+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
diff --git a/trytond_purchase_invoice_line_standalone.egg-info/SOURCES.txt b/trytond_purchase_invoice_line_standalone.egg-info/SOURCES.txt
new file mode 100644
index 0000000..218459e
--- /dev/null
+++ b/trytond_purchase_invoice_line_standalone.egg-info/SOURCES.txt
@@ -0,0 +1,23 @@
+CHANGELOG
+COPYRIGHT
+INSTALL
+LICENSE
+MANIFEST.in
+README
+de_DE.csv
+es_CO.csv
+es_ES.csv
+fr_FR.csv
+purchase.xml
+setup.py
+./__init__.py
+./__tryton__.py
+./invoice.py
+./purchase.py
+trytond_purchase_invoice_line_standalone.egg-info/PKG-INFO
+trytond_purchase_invoice_line_standalone.egg-info/SOURCES.txt
+trytond_purchase_invoice_line_standalone.egg-info/dependency_links.txt
+trytond_purchase_invoice_line_standalone.egg-info/entry_points.txt
+trytond_purchase_invoice_line_standalone.egg-info/not-zip-safe
+trytond_purchase_invoice_line_standalone.egg-info/requires.txt
+trytond_purchase_invoice_line_standalone.egg-info/top_level.txt
\ No newline at end of file
diff --git a/trytond_purchase_invoice_line_standalone.egg-info/dependency_links.txt b/trytond_purchase_invoice_line_standalone.egg-info/dependency_links.txt
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/trytond_purchase_invoice_line_standalone.egg-info/dependency_links.txt
@@ -0,0 +1 @@
+
diff --git a/trytond_purchase_invoice_line_standalone.egg-info/entry_points.txt b/trytond_purchase_invoice_line_standalone.egg-info/entry_points.txt
new file mode 100644
index 0000000..4004974
--- /dev/null
+++ b/trytond_purchase_invoice_line_standalone.egg-info/entry_points.txt
@@ -0,0 +1,4 @@
+
+ [trytond.modules]
+ purchase_invoice_line_standalone = trytond.modules.purchase_invoice_line_standalone
+
\ No newline at end of file
diff --git a/trytond_purchase_invoice_line_standalone.egg-info/not-zip-safe b/trytond_purchase_invoice_line_standalone.egg-info/not-zip-safe
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/trytond_purchase_invoice_line_standalone.egg-info/not-zip-safe
@@ -0,0 +1 @@
+
diff --git a/trytond_purchase_invoice_line_standalone.egg-info/requires.txt b/trytond_purchase_invoice_line_standalone.egg-info/requires.txt
new file mode 100644
index 0000000..456406a
--- /dev/null
+++ b/trytond_purchase_invoice_line_standalone.egg-info/requires.txt
@@ -0,0 +1,4 @@
+trytond_purchase
+trytond_account_invoice_line_standalone
+trytond >= 1.2
+trytond < 1.3
\ No newline at end of file
diff --git a/trytond_purchase_invoice_line_standalone.egg-info/top_level.txt b/trytond_purchase_invoice_line_standalone.egg-info/top_level.txt
new file mode 100644
index 0000000..93df119
--- /dev/null
+++ b/trytond_purchase_invoice_line_standalone.egg-info/top_level.txt
@@ -0,0 +1 @@
+trytond
--
tryton-modules-purchase-invoice-line-standalone
More information about the tryton-debian-vcs
mailing list