[tryton-debian-vcs] tryton-modules-commission branch upstream updated. upstream/4.4.0-1-g7993760
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Fri Nov 10 12:09:57 UTC 2017
The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-commission.git;a=commitdiff;h=upstream/4.4.0-1-g7993760
commit 7993760a9354e1cdb021eae25927c138009ee3da
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Nov 6 14:40:40 2017 +0100
Adding upstream version 4.6.0.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/.drone.yml b/.drone.yml
new file mode 100644
index 0000000..e0bc2f7
--- /dev/null
+++ b/.drone.yml
@@ -0,0 +1,51 @@
+clone:
+ hg:
+ image: plugins/hg
+
+pipeline:
+ tox:
+ image: ${IMAGE}
+ environment:
+ - CFLAGS=-O0
+ - DB_CACHE=/cache
+ - TOX_TESTENV_PASSENV=CFLAGS DB_CACHE
+ - POSTGRESQL_URI=postgresql://postgres@postgresql:5432/
+ commands:
+ - pip install tox
+ - tox -e "${TOXENV}-${DATABASE}"
+ volumes:
+ - cache:/root/.cache
+
+services:
+ postgresql:
+ image: postgres
+ when:
+ matrix:
+ DATABASE: postgresql
+
+matrix:
+ include:
+ - IMAGE: python:2.7
+ TOXENV: py27
+ DATABASE: sqlite
+ - IMAGE: python:2.7
+ TOXENV: py27
+ DATABASE: postgresql
+ - IMAGE: python:3.4
+ TOXENV: py34
+ DATABASE: sqlite
+ - IMAGE: python:3.4
+ TOXENV: py34
+ DATABASE: postgresql
+ - IMAGE: python:3.5
+ TOXENV: py35
+ DATABASE: sqlite
+ - IMAGE: python:3.5
+ TOXENV: py35
+ DATABASE: postgresql
+ - IMAGE: python:3.6
+ TOXENV: py36
+ DATABASE: sqlite
+ - IMAGE: python:3.6
+ TOXENV: py36
+ DATABASE: postgresql
diff --git a/CHANGELOG b/CHANGELOG
index 98e0a48..b5230c7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+Version 4.6.0 - 2017-10-30
+* Bug fixes (see mercurial logs for details)
+* Don't match product and category lines when product is empty
+
Version 4.4.0 - 2017-05-01
* Bug fixes (see mercurial logs for details)
* Add category as plan matching criteria
diff --git a/PKG-INFO b/PKG-INFO
index 4222ec3..404e7f6 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_commission
-Version: 4.4.0
+Version: 4.6.0
Summary: Tryton module for commission
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/4.4/
+Download-URL: http://downloads.tryton.org/4.6/
Description: trytond_commission
==================
@@ -69,9 +69,9 @@ Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3.3
Classifier: Programming Language :: Python :: 3.4
Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3.6
Classifier: Programming Language :: Python :: Implementation :: CPython
Classifier: Programming Language :: Python :: Implementation :: PyPy
Classifier: Topic :: Office/Business
diff --git a/commission.py b/commission.py
index 1624aed..27d181e 100644
--- a/commission.py
+++ b/commission.py
@@ -70,8 +70,8 @@ class Agent(ModelSQL, ModelView):
else:
bool_op = 'OR'
return [bool_op,
- ('party',) + tuple(clause[1:]),
- ('plan',) + tuple(clause[1:]),
+ ('party.rec_name',) + tuple(clause[1:]),
+ ('plan.rec_name',) + tuple(clause[1:]),
]
@classmethod
@@ -104,9 +104,9 @@ class Agent(ModelSQL, ModelView):
@property
def account(self):
if self.type_ == 'agent':
- return self.party.account_payable
+ return self.party.account_payable_used
elif self.type_ == 'principal':
- return self.party.account_receivable
+ return self.party.account_receivable_used
class Plan(ModelSQL, ModelView):
@@ -144,8 +144,11 @@ class Plan(ModelSQL, ModelView):
if pattern is None:
pattern = {}
if product:
- pattern['categories'] = [c.id for c in product.categories]
+ pattern['categories'] = [c.id for c in product.categories_all]
pattern['product'] = product.id
+ else:
+ pattern['categories'] = []
+ pattern['product'] = None
context = self.get_context_formula(amount, product)
for line in self.lines:
if line.match(pattern):
diff --git a/invoice.py b/invoice.py
index 2151cc0..aec9f31 100644
--- a/invoice.py
+++ b/invoice.py
@@ -17,6 +17,7 @@ class Invoice:
__name__ = 'account.invoice'
agent = fields.Many2One('commission.agent', 'Commission Agent',
domain=[
+ ('type_', '=', 'agent'),
('company', '=', Eval('company', -1)),
],
states={
@@ -99,9 +100,9 @@ class Invoice:
Commission.save(to_save)
def _credit(self):
- values = super(Invoice, self)._credit()
- values['agent'] = self.agent.id if self.agent else None
- return values
+ credit = super(Invoice, self)._credit()
+ credit.agent = self.agent
+ return credit
class InvoiceLine:
diff --git a/locale/bg.po b/locale/bg.po
index df94381..310bfda 100644
--- a/locale/bg.po
+++ b/locale/bg.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -78,10 +78,9 @@ msgctxt "field:commission,product:"
msgid "Product"
msgstr "Продукт"
-#, fuzzy
msgctxt "field:commission,rec_name:"
-msgid "Name"
-msgstr "Условие за плащане"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:commission,type_:"
@@ -137,10 +136,9 @@ msgctxt "field:commission.agent,plan:"
msgid "Plan"
msgstr "План"
-#, fuzzy
msgctxt "field:commission.agent,rec_name:"
-msgid "Name"
-msgstr "Условие за плащане"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:commission.agent,type_:"
@@ -208,10 +206,9 @@ msgctxt "field:commission.plan,name:"
msgid "Name"
msgstr "Условие за плащане"
-#, fuzzy
msgctxt "field:commission.plan,rec_name:"
-msgid "Name"
-msgstr "Условие за плащане"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:commission.plan,write_date:"
@@ -257,10 +254,9 @@ msgctxt "field:commission.plan.line,product:"
msgid "Product"
msgstr "Продукт"
-#, fuzzy
msgctxt "field:commission.plan.line,rec_name:"
-msgid "Name"
-msgstr "Условие за плащане"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:commission.plan.line,sequence:"
@@ -304,10 +300,9 @@ msgctxt "field:product.template-commission.agent,id:"
msgid "ID"
msgstr "ID"
-#, fuzzy
msgctxt "field:product.template-commission.agent,rec_name:"
-msgid "Name"
-msgstr "Условие за плащане"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:product.template-commission.agent,template:"
diff --git a/locale/ca.po b/locale/ca.po
index 1615cec..5b43234 100644
--- a/locale/ca.po
+++ b/locale/ca.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -71,8 +71,8 @@ msgid "Product"
msgstr "Producte"
msgctxt "field:commission,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
msgctxt "field:commission,type_:"
msgid "Type"
@@ -119,8 +119,8 @@ msgid "Plan"
msgstr "Pla"
msgctxt "field:commission.agent,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
msgctxt "field:commission.agent,type_:"
msgid "Type"
@@ -179,8 +179,8 @@ msgid "Name"
msgstr "Nom"
msgctxt "field:commission.plan,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
msgctxt "field:commission.plan,write_date:"
msgid "Write Date"
@@ -219,8 +219,8 @@ msgid "Product"
msgstr "Producte"
msgctxt "field:commission.plan.line,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
msgctxt "field:commission.plan.line,sequence:"
msgid "Sequence"
@@ -259,8 +259,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:product.template-commission.agent,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
msgctxt "field:product.template-commission.agent,template:"
msgid "Template"
diff --git a/locale/cs.po b/locale/cs.po
index 3317df9..086ef65 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -68,10 +68,9 @@ msgctxt "field:commission,product:"
msgid "Product"
msgstr ""
-#, fuzzy
msgctxt "field:commission,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
msgctxt "field:commission,type_:"
msgid "Type"
@@ -117,10 +116,9 @@ msgctxt "field:commission.agent,plan:"
msgid "Plan"
msgstr ""
-#, fuzzy
msgctxt "field:commission.agent,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
msgctxt "field:commission.agent,type_:"
msgid "Type"
@@ -179,10 +177,9 @@ msgctxt "field:commission.plan,name:"
msgid "Name"
msgstr "Namu"
-#, fuzzy
msgctxt "field:commission.plan,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
msgctxt "field:commission.plan,write_date:"
msgid "Write Date"
@@ -220,10 +217,9 @@ msgctxt "field:commission.plan.line,product:"
msgid "Product"
msgstr ""
-#, fuzzy
msgctxt "field:commission.plan.line,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
msgctxt "field:commission.plan.line,sequence:"
msgid "Sequence"
@@ -261,10 +257,9 @@ msgctxt "field:product.template-commission.agent,id:"
msgid "ID"
msgstr ""
-#, fuzzy
msgctxt "field:product.template-commission.agent,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.template-commission.agent,template:"
msgid "Template"
diff --git a/locale/de.po b/locale/de.po
index f16e8e8..081df7e 100644
--- a/locale/de.po
+++ b/locale/de.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -71,8 +71,8 @@ msgid "Product"
msgstr "Variante"
msgctxt "field:commission,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
msgctxt "field:commission,type_:"
msgid "Type"
@@ -119,8 +119,8 @@ msgid "Plan"
msgstr "Plan"
msgctxt "field:commission.agent,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
msgctxt "field:commission.agent,type_:"
msgid "Type"
@@ -179,8 +179,8 @@ msgid "Name"
msgstr "Name"
msgctxt "field:commission.plan,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
msgctxt "field:commission.plan,write_date:"
msgid "Write Date"
@@ -219,8 +219,8 @@ msgid "Product"
msgstr "Variante"
msgctxt "field:commission.plan.line,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
msgctxt "field:commission.plan.line,sequence:"
msgid "Sequence"
@@ -259,8 +259,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:product.template-commission.agent,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.template-commission.agent,template:"
msgid "Template"
diff --git a/locale/es.po b/locale/es.po
index 242b9f0..3835446 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -71,8 +71,8 @@ msgid "Product"
msgstr "Producto"
msgctxt "field:commission,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
msgctxt "field:commission,type_:"
msgid "Type"
@@ -119,8 +119,8 @@ msgid "Plan"
msgstr "Plan"
msgctxt "field:commission.agent,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
msgctxt "field:commission.agent,type_:"
msgid "Type"
@@ -179,8 +179,8 @@ msgid "Name"
msgstr "Nombre"
msgctxt "field:commission.plan,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
msgctxt "field:commission.plan,write_date:"
msgid "Write Date"
@@ -219,8 +219,8 @@ msgid "Product"
msgstr "Producto"
msgctxt "field:commission.plan.line,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
msgctxt "field:commission.plan.line,sequence:"
msgid "Sequence"
@@ -259,8 +259,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:product.template-commission.agent,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
msgctxt "field:product.template-commission.agent,template:"
msgid "Template"
diff --git a/locale/es_419.po b/locale/es_419.po
index 03df106..37e399d 100644
--- a/locale/es_419.po
+++ b/locale/es_419.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -69,7 +69,7 @@ msgid "Product"
msgstr ""
msgctxt "field:commission,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:commission,type_:"
@@ -117,7 +117,7 @@ msgid "Plan"
msgstr ""
msgctxt "field:commission.agent,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:commission.agent,type_:"
@@ -177,7 +177,7 @@ msgid "Name"
msgstr ""
msgctxt "field:commission.plan,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:commission.plan,write_date:"
@@ -217,7 +217,7 @@ msgid "Product"
msgstr ""
msgctxt "field:commission.plan.line,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:commission.plan.line,sequence:"
@@ -257,7 +257,7 @@ msgid "ID"
msgstr ""
msgctxt "field:product.template-commission.agent,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:product.template-commission.agent,template:"
diff --git a/locale/fr.po b/locale/fr.po
index a5b6fd6..9e82e06 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -71,8 +71,8 @@ msgid "Product"
msgstr "Produit"
msgctxt "field:commission,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
msgctxt "field:commission,type_:"
msgid "Type"
@@ -119,8 +119,8 @@ msgid "Plan"
msgstr "Plan"
msgctxt "field:commission.agent,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
msgctxt "field:commission.agent,type_:"
msgid "Type"
@@ -179,8 +179,8 @@ msgid "Name"
msgstr "Nom"
msgctxt "field:commission.plan,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
msgctxt "field:commission.plan,write_date:"
msgid "Write Date"
@@ -219,8 +219,8 @@ msgid "Product"
msgstr "Produit"
msgctxt "field:commission.plan.line,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
msgctxt "field:commission.plan.line,sequence:"
msgid "Sequence"
@@ -259,8 +259,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:product.template-commission.agent,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
msgctxt "field:product.template-commission.agent,template:"
msgid "Template"
diff --git a/locale/hu_HU.po b/locale/hu_HU.po
index aac8b20..de7a932 100644
--- a/locale/hu_HU.po
+++ b/locale/hu_HU.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -74,10 +74,9 @@ msgctxt "field:commission,product:"
msgid "Product"
msgstr "Termék"
-#, fuzzy
msgctxt "field:commission,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:commission,type_:"
@@ -132,10 +131,9 @@ msgctxt "field:commission.agent,plan:"
msgid "Plan"
msgstr ""
-#, fuzzy
msgctxt "field:commission.agent,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:commission.agent,type_:"
@@ -205,10 +203,9 @@ msgctxt "field:commission.plan,name:"
msgid "Name"
msgstr "Név"
-#, fuzzy
msgctxt "field:commission.plan,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:commission.plan,write_date:"
@@ -253,10 +250,9 @@ msgctxt "field:commission.plan.line,product:"
msgid "Product"
msgstr "Termék"
-#, fuzzy
msgctxt "field:commission.plan.line,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:commission.plan.line,sequence:"
@@ -300,10 +296,9 @@ msgctxt "field:product.template-commission.agent,id:"
msgid "ID"
msgstr "ID"
-#, fuzzy
msgctxt "field:product.template-commission.agent,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:product.template-commission.agent,template:"
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 84a3f03..99cae86 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -71,8 +71,8 @@ msgid "Product"
msgstr "Prodotto"
msgctxt "field:commission,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
msgctxt "field:commission,type_:"
msgid "Type"
@@ -120,8 +120,8 @@ msgid "Plan"
msgstr "Piano"
msgctxt "field:commission.agent,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
msgctxt "field:commission.agent,type_:"
msgid "Type"
@@ -180,8 +180,8 @@ msgid "Name"
msgstr "Nome"
msgctxt "field:commission.plan,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
msgctxt "field:commission.plan,write_date:"
msgid "Write Date"
@@ -220,8 +220,8 @@ msgid "Product"
msgstr "Prodotto"
msgctxt "field:commission.plan.line,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
msgctxt "field:commission.plan.line,sequence:"
msgid "Sequence"
@@ -260,8 +260,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:product.template-commission.agent,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.template-commission.agent,template:"
msgid "Template"
diff --git a/locale/ja_JP.po b/locale/ja_JP.po
index 0ebf195..9526b1b 100644
--- a/locale/ja_JP.po
+++ b/locale/ja_JP.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -73,7 +73,7 @@ msgid "Product"
msgstr ""
msgctxt "field:commission,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:commission,type_:"
@@ -121,7 +121,7 @@ msgid "Plan"
msgstr ""
msgctxt "field:commission.agent,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:commission.agent,type_:"
@@ -181,7 +181,7 @@ msgid "Name"
msgstr ""
msgctxt "field:commission.plan,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:commission.plan,write_date:"
@@ -221,7 +221,7 @@ msgid "Product"
msgstr ""
msgctxt "field:commission.plan.line,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:commission.plan.line,sequence:"
@@ -262,7 +262,7 @@ msgid "ID"
msgstr ""
msgctxt "field:product.template-commission.agent,rec_name:"
-msgid "Name"
+msgid "Record Name"
msgstr ""
msgctxt "field:product.template-commission.agent,template:"
diff --git a/locale/lo.po b/locale/lo.po
index 9c8a188..3b57446 100644
--- a/locale/lo.po
+++ b/locale/lo.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -77,10 +77,9 @@ msgctxt "field:commission,product:"
msgid "Product"
msgstr "ຜະລິດຕະພັນ"
-#, fuzzy
msgctxt "field:commission,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:commission,type_:"
@@ -135,10 +134,9 @@ msgctxt "field:commission.agent,plan:"
msgid "Plan"
msgstr ""
-#, fuzzy
msgctxt "field:commission.agent,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:commission.agent,type_:"
@@ -206,10 +204,9 @@ msgctxt "field:commission.plan,name:"
msgid "Name"
msgstr "ຊື່"
-#, fuzzy
msgctxt "field:commission.plan,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:commission.plan,write_date:"
@@ -253,10 +250,9 @@ msgctxt "field:commission.plan.line,product:"
msgid "Product"
msgstr "ຜະລິດຕະພັນ"
-#, fuzzy
msgctxt "field:commission.plan.line,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:commission.plan.line,sequence:"
@@ -300,10 +296,9 @@ msgctxt "field:product.template-commission.agent,id:"
msgid "ID"
msgstr "ເລດລຳດັບ"
-#, fuzzy
msgctxt "field:product.template-commission.agent,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:product.template-commission.agent,template:"
diff --git a/locale/lt.po b/locale/lt.po
index 3317df9..086ef65 100644
--- a/locale/lt.po
+++ b/locale/lt.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -68,10 +68,9 @@ msgctxt "field:commission,product:"
msgid "Product"
msgstr ""
-#, fuzzy
msgctxt "field:commission,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
msgctxt "field:commission,type_:"
msgid "Type"
@@ -117,10 +116,9 @@ msgctxt "field:commission.agent,plan:"
msgid "Plan"
msgstr ""
-#, fuzzy
msgctxt "field:commission.agent,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
msgctxt "field:commission.agent,type_:"
msgid "Type"
@@ -179,10 +177,9 @@ msgctxt "field:commission.plan,name:"
msgid "Name"
msgstr "Namu"
-#, fuzzy
msgctxt "field:commission.plan,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
msgctxt "field:commission.plan,write_date:"
msgid "Write Date"
@@ -220,10 +217,9 @@ msgctxt "field:commission.plan.line,product:"
msgid "Product"
msgstr ""
-#, fuzzy
msgctxt "field:commission.plan.line,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
msgctxt "field:commission.plan.line,sequence:"
msgid "Sequence"
@@ -261,10 +257,9 @@ msgctxt "field:product.template-commission.agent,id:"
msgid "ID"
msgstr ""
-#, fuzzy
msgctxt "field:product.template-commission.agent,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.template-commission.agent,template:"
msgid "Template"
diff --git a/locale/nl.po b/locale/nl.po
index 5d4608a..15a743b 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -78,10 +78,9 @@ msgctxt "field:commission,product:"
msgid "Product"
msgstr "Producten"
-#, fuzzy
msgctxt "field:commission,rec_name:"
-msgid "Name"
-msgstr "Naam bijlage"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:commission,type_:"
@@ -136,10 +135,9 @@ msgctxt "field:commission.agent,plan:"
msgid "Plan"
msgstr ""
-#, fuzzy
msgctxt "field:commission.agent,rec_name:"
-msgid "Name"
-msgstr "Naam bijlage"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:commission.agent,type_:"
@@ -207,10 +205,9 @@ msgctxt "field:commission.plan,name:"
msgid "Name"
msgstr "Naam bijlage"
-#, fuzzy
msgctxt "field:commission.plan,rec_name:"
-msgid "Name"
-msgstr "Naam bijlage"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:commission.plan,write_date:"
@@ -254,10 +251,9 @@ msgctxt "field:commission.plan.line,product:"
msgid "Product"
msgstr "Producten"
-#, fuzzy
msgctxt "field:commission.plan.line,rec_name:"
-msgid "Name"
-msgstr "Naam bijlage"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:commission.plan.line,sequence:"
@@ -301,10 +297,9 @@ msgctxt "field:product.template-commission.agent,id:"
msgid "ID"
msgstr "ID"
-#, fuzzy
msgctxt "field:product.template-commission.agent,rec_name:"
-msgid "Name"
-msgstr "Naam bijlage"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:product.template-commission.agent,template:"
diff --git a/locale/pl.po b/locale/pl.po
index 0ebf195..b416668 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -38,23 +38,23 @@ msgstr ""
msgctxt "field:commission,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Data utworzenia"
msgctxt "field:commission,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Utworzył"
msgctxt "field:commission,currency:"
msgid "Currency"
-msgstr ""
+msgstr "Waluta"
msgctxt "field:commission,date:"
msgid "Date"
-msgstr ""
+msgstr "Data"
msgctxt "field:commission,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:commission,invoice_line:"
msgid "Invoice Line"
@@ -70,47 +70,47 @@ msgstr ""
msgctxt "field:commission,product:"
msgid "Product"
-msgstr ""
+msgstr "Produkt"
msgctxt "field:commission,rec_name:"
-msgid "Name"
-msgstr ""
+msgid "Record Name"
+msgstr "Nazwa rekordu"
msgctxt "field:commission,type_:"
msgid "Type"
-msgstr ""
+msgstr "Typ"
msgctxt "field:commission,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Data zapisu"
msgctxt "field:commission,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Zapisał"
msgctxt "field:commission.agent,company:"
msgid "Company"
-msgstr ""
+msgstr "Firma"
msgctxt "field:commission.agent,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Data utworzenia"
msgctxt "field:commission.agent,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Utworzył"
msgctxt "field:commission.agent,currency:"
msgid "Currency"
-msgstr ""
+msgstr "Waluta"
msgctxt "field:commission.agent,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:commission.agent,party:"
msgid "Party"
-msgstr ""
+msgstr "Strona"
msgctxt "field:commission.agent,pending_amount:"
msgid "Pending Amount"
@@ -118,39 +118,39 @@ msgstr ""
msgctxt "field:commission.agent,plan:"
msgid "Plan"
-msgstr ""
+msgstr "Plan"
msgctxt "field:commission.agent,rec_name:"
-msgid "Name"
-msgstr ""
+msgid "Record Name"
+msgstr "Nazwa rekordu"
msgctxt "field:commission.agent,type_:"
msgid "Type"
-msgstr ""
+msgstr "Typ"
msgctxt "field:commission.agent,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Data zapisu"
msgctxt "field:commission.agent,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Zapisał"
msgctxt "field:commission.create_invoice.ask,from_:"
msgid "From"
-msgstr ""
+msgstr "Od"
msgctxt "field:commission.create_invoice.ask,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:commission.create_invoice.ask,to:"
msgid "To"
-msgstr ""
+msgstr "Do"
msgctxt "field:commission.create_invoice.ask,type_:"
msgid "Type"
-msgstr ""
+msgstr "Typ"
msgctxt "field:commission.plan,commission_method:"
msgid "Commission Method"
@@ -162,15 +162,15 @@ msgstr ""
msgctxt "field:commission.plan,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Data utworzenia"
msgctxt "field:commission.plan,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Utworzył"
msgctxt "field:commission.plan,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:commission.plan,lines:"
msgid "Lines"
@@ -178,63 +178,63 @@ msgstr ""
msgctxt "field:commission.plan,name:"
msgid "Name"
-msgstr ""
+msgstr "Nazwa"
msgctxt "field:commission.plan,rec_name:"
-msgid "Name"
-msgstr ""
+msgid "Record Name"
+msgstr "Nazwa rekordu"
msgctxt "field:commission.plan,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Data zapisu"
msgctxt "field:commission.plan,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Zapisał"
msgctxt "field:commission.plan.line,category:"
msgid "Category"
-msgstr ""
+msgstr "Kategoria"
msgctxt "field:commission.plan.line,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Data utworzenia"
msgctxt "field:commission.plan.line,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Utworzył"
msgctxt "field:commission.plan.line,formula:"
msgid "Formula"
-msgstr ""
+msgstr "Formuła"
msgctxt "field:commission.plan.line,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:commission.plan.line,plan:"
msgid "Plan"
-msgstr ""
+msgstr "Plan"
msgctxt "field:commission.plan.line,product:"
msgid "Product"
-msgstr ""
+msgstr "Produkt"
msgctxt "field:commission.plan.line,rec_name:"
-msgid "Name"
-msgstr ""
+msgid "Record Name"
+msgstr "Nazwa rekordu"
msgctxt "field:commission.plan.line,sequence:"
msgid "Sequence"
-msgstr ""
+msgstr "Sekwencja"
msgctxt "field:commission.plan.line,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Data zapisu"
msgctxt "field:commission.plan.line,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Zapisał"
msgctxt "field:product.product,principals:"
msgid "Commission Principals"
@@ -251,31 +251,31 @@ msgstr "Agents"
msgctxt "field:product.template-commission.agent,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Data utworzenia"
msgctxt "field:product.template-commission.agent,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Utworzył"
msgctxt "field:product.template-commission.agent,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:product.template-commission.agent,rec_name:"
-msgid "Name"
-msgstr ""
+msgid "Record Name"
+msgstr "Nazwa rekordu"
msgctxt "field:product.template-commission.agent,template:"
msgid "Template"
-msgstr ""
+msgstr "Szablon"
msgctxt "field:product.template-commission.agent,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Data zapisu"
msgctxt "field:product.template-commission.agent,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Zapisał"
msgctxt "field:sale.line,principal:"
msgid "Commission Principal"
@@ -298,11 +298,11 @@ msgstr ""
msgctxt "model:account.journal,name:journal_commission"
msgid "Commission"
-msgstr "Commission"
+msgstr ""
msgctxt "model:account.journal.type,name:journal_type_commission"
msgid "Commission"
-msgstr "Commission"
+msgstr ""
#, fuzzy
msgctxt "model:commission,name:"
@@ -331,55 +331,55 @@ msgstr "Commission Plans"
msgctxt "model:ir.action,name:act_agent_form"
msgid "Agents"
-msgstr "Agents"
+msgstr ""
msgctxt "model:ir.action,name:act_commission_create_invoice"
msgid "Create Commission Invoices"
-msgstr "Create Commission Invoices"
+msgstr ""
msgctxt "model:ir.action,name:act_commission_form"
msgid "Commissions"
-msgstr "Commissions"
+msgstr ""
msgctxt "model:ir.action,name:act_commission_form2"
msgid "Commissions"
-msgstr "Commissions"
+msgstr ""
msgctxt "model:ir.action,name:act_commission_from_relate"
msgid "From Commissions"
-msgstr "From Commissions"
+msgstr ""
msgctxt "model:ir.action,name:act_commission_relate"
msgid "Commissions"
-msgstr "Commissions"
+msgstr ""
msgctxt "model:ir.action,name:act_plan_form"
msgid "Commission Plans"
-msgstr "Commission Plans"
+msgstr ""
msgctxt "model:ir.ui.menu,name:menu_agent_form"
msgid "Agents"
-msgstr "Agents"
+msgstr ""
msgctxt "model:ir.ui.menu,name:menu_commission"
msgid "Commission"
-msgstr "Commission"
+msgstr ""
msgctxt "model:ir.ui.menu,name:menu_commission_create_invoice"
msgid "Create Commission Invoices"
-msgstr "Create Commission Invoices"
+msgstr ""
msgctxt "model:ir.ui.menu,name:menu_commission_form"
msgid "Commissions"
-msgstr "Commissions"
+msgstr ""
msgctxt "model:ir.ui.menu,name:menu_configuration"
msgid "Configuration"
-msgstr "Configuration"
+msgstr "Konfiguracja"
msgctxt "model:ir.ui.menu,name:menu_plan_form"
msgid "Commission Plans"
-msgstr "Commission Plans"
+msgstr ""
msgctxt "model:product.template-commission.agent,name:"
msgid "Product Template - Commission Agent"
@@ -387,11 +387,11 @@ msgstr ""
msgctxt "model:res.group,name:group_commission"
msgid "Commission"
-msgstr "Commission"
+msgstr ""
msgctxt "model:res.group,name:group_commission_admin"
msgid "Commission Administration"
-msgstr "Commission Administration"
+msgstr ""
msgctxt "selection:commission,invoice_state:"
msgid ""
@@ -452,7 +452,7 @@ msgstr "Commissions"
msgctxt "view:commission:"
msgid "Invoice"
-msgstr ""
+msgstr "Faktura"
#, fuzzy
msgctxt "view:product.template:"
@@ -466,8 +466,8 @@ msgstr "Commissions"
msgctxt "wizard_button:commission.create_invoice,ask,create_:"
msgid "OK"
-msgstr ""
+msgstr "OK"
msgctxt "wizard_button:commission.create_invoice,ask,end:"
msgid "Cancel"
-msgstr ""
+msgstr "Anuluj"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index e401c4c..aaa84e5 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -71,8 +71,8 @@ msgid "Product"
msgstr "Produto"
msgctxt "field:commission,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
msgctxt "field:commission,type_:"
msgid "Type"
@@ -119,8 +119,8 @@ msgid "Plan"
msgstr "Plano"
msgctxt "field:commission.agent,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
msgctxt "field:commission.agent,type_:"
msgid "Type"
@@ -179,8 +179,8 @@ msgid "Name"
msgstr "Nome"
msgctxt "field:commission.plan,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
msgctxt "field:commission.plan,write_date:"
msgid "Write Date"
@@ -219,8 +219,8 @@ msgid "Product"
msgstr "Produto"
msgctxt "field:commission.plan.line,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
msgctxt "field:commission.plan.line,sequence:"
msgid "Sequence"
@@ -259,8 +259,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:product.template-commission.agent,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
msgctxt "field:product.template-commission.agent,template:"
msgid "Template"
diff --git a/locale/ru.po b/locale/ru.po
index d74fd5b..ce61502 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -78,10 +78,9 @@ msgctxt "field:commission,product:"
msgid "Product"
msgstr "Товарно материальные ценности (ТМЦ)"
-#, fuzzy
msgctxt "field:commission,rec_name:"
-msgid "Name"
-msgstr "Правило оплаты"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:commission,type_:"
@@ -137,10 +136,9 @@ msgctxt "field:commission.agent,plan:"
msgid "Plan"
msgstr "План"
-#, fuzzy
msgctxt "field:commission.agent,rec_name:"
-msgid "Name"
-msgstr "Правило оплаты"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:commission.agent,type_:"
@@ -208,10 +206,9 @@ msgctxt "field:commission.plan,name:"
msgid "Name"
msgstr "Правило оплаты"
-#, fuzzy
msgctxt "field:commission.plan,rec_name:"
-msgid "Name"
-msgstr "Правило оплаты"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:commission.plan,write_date:"
@@ -256,10 +253,9 @@ msgctxt "field:commission.plan.line,product:"
msgid "Product"
msgstr "Товарно материальные ценности (ТМЦ)"
-#, fuzzy
msgctxt "field:commission.plan.line,rec_name:"
-msgid "Name"
-msgstr "Правило оплаты"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:commission.plan.line,sequence:"
@@ -303,10 +299,9 @@ msgctxt "field:product.template-commission.agent,id:"
msgid "ID"
msgstr "ID"
-#, fuzzy
msgctxt "field:product.template-commission.agent,rec_name:"
-msgid "Name"
-msgstr "Правило оплаты"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:product.template-commission.agent,template:"
diff --git a/locale/sl.po b/locale/sl.po
index 55c075d..9a479b8 100644
--- a/locale/sl.po
+++ b/locale/sl.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -71,8 +71,8 @@ msgid "Product"
msgstr "Izdelek"
msgctxt "field:commission,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
msgctxt "field:commission,type_:"
msgid "Type"
@@ -119,8 +119,8 @@ msgid "Plan"
msgstr "Načrt"
msgctxt "field:commission.agent,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
msgctxt "field:commission.agent,type_:"
msgid "Type"
@@ -179,8 +179,8 @@ msgid "Name"
msgstr "Naziv"
msgctxt "field:commission.plan,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
msgctxt "field:commission.plan,write_date:"
msgid "Write Date"
@@ -219,8 +219,8 @@ msgid "Product"
msgstr "Izdelek"
msgctxt "field:commission.plan.line,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
msgctxt "field:commission.plan.line,sequence:"
msgid "Sequence"
@@ -259,8 +259,8 @@ msgid "ID"
msgstr "ID"
msgctxt "field:product.template-commission.agent,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.template-commission.agent,template:"
msgid "Template"
diff --git a/locale/zh_CN.po b/locale/zh_CN.po
index 75fb795..32bffc8 100644
--- a/locale/zh_CN.po
+++ b/locale/zh_CN.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -72,10 +72,9 @@ msgctxt "field:commission,product:"
msgid "Product"
msgstr ""
-#, fuzzy
msgctxt "field:commission,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:commission,type_:"
@@ -127,10 +126,9 @@ msgctxt "field:commission.agent,plan:"
msgid "Plan"
msgstr ""
-#, fuzzy
msgctxt "field:commission.agent,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:commission.agent,type_:"
@@ -197,10 +195,9 @@ msgctxt "field:commission.plan,name:"
msgid "Name"
msgstr "纳木"
-#, fuzzy
msgctxt "field:commission.plan,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:commission.plan,write_date:"
@@ -243,10 +240,9 @@ msgctxt "field:commission.plan.line,product:"
msgid "Product"
msgstr ""
-#, fuzzy
msgctxt "field:commission.plan.line,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
#, fuzzy
msgctxt "field:commission.plan.line,sequence:"
@@ -290,10 +286,9 @@ msgctxt "field:product.template-commission.agent,id:"
msgid "ID"
msgstr "编号"
-#, fuzzy
msgctxt "field:product.template-commission.agent,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
msgctxt "field:product.template-commission.agent,template:"
msgid "Template"
diff --git a/sale.py b/sale.py
index 162c464..b3a5609 100644
--- a/sale.py
+++ b/sale.py
@@ -15,6 +15,7 @@ class Sale:
__name__ = 'sale.sale'
agent = fields.Many2One('commission.agent', 'Commission Agent',
domain=[
+ ('type_', '=', 'agent'),
('company', '=', Eval('company', -1)),
],
states={
diff --git a/setup.cfg b/setup.cfg
index 861a9f5..8bfd5a1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,4 @@
[egg_info]
tag_build =
tag_date = 0
-tag_svn_revision = 0
diff --git a/setup.py b/setup.py
index 3c885ac..c800f25 100644
--- a/setup.py
+++ b/setup.py
@@ -102,9 +102,9 @@ setup(name=name,
'Natural Language :: Spanish',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2.7',
- 'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
+ 'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: Implementation :: CPython',
'Programming Language :: Python :: Implementation :: PyPy',
'Topic :: Office/Business',
diff --git a/tests/scenario_commission.rst b/tests/scenario_commission.rst
index 3a1c650..8488c61 100644
--- a/tests/scenario_commission.rst
+++ b/tests/scenario_commission.rst
@@ -47,20 +47,16 @@ Create commission product::
>>> Uom = Model.get('product.uom')
>>> Template = Model.get('product.template')
- >>> Product = Model.get('product.product')
>>> unit, = Uom.find([('name', '=', 'Unit')])
- >>> commission_product = Product()
>>> template = Template()
>>> template.name = 'Commission'
>>> template.default_uom = unit
>>> template.type = 'service'
>>> template.list_price = Decimal(0)
- >>> template.cost_price = Decimal(0)
>>> template.account_expense = accounts['expense']
>>> template.account_revenue = accounts['revenue']
>>> template.save()
- >>> commission_product.template = template
- >>> commission_product.save()
+ >>> commission_product, = template.products
Create commission plan::
@@ -102,7 +98,6 @@ Create principal::
Create product sold::
- >>> product = Product()
>>> template = Template()
>>> template.name = 'Product'
>>> template.default_uom = unit
@@ -113,8 +108,7 @@ Create product sold::
>>> template.account_revenue = accounts['revenue']
>>> template.principals.append(principal)
>>> template.save()
- >>> product.template = template
- >>> product.save()
+ >>> product, = template.products
Create invoice::
@@ -182,3 +176,15 @@ Create commission invoices::
>>> commissions = Commission.find([])
>>> [c.invoice_state for c in commissions]
[u'invoiced', u'invoiced']
+
+Credit invoice::
+
+ >>> invoice, = Invoice.find([
+ ... ('type', '=', 'out'),
+ ... ('agent', '=', agent.id),
+ ... ])
+ >>> credit = Wizard('account.invoice.credit', [invoice])
+ >>> credit.execute('credit')
+ >>> credit_note, = credit.actions[0]
+ >>> credit_note.agent == agent
+ True
diff --git a/tests/test_commission.py b/tests/test_commission.py
index 30dda03..fd30747 100644
--- a/tests/test_commission.py
+++ b/tests/test_commission.py
@@ -15,6 +15,42 @@ from trytond.pool import Pool
from trytond.modules.company.tests import create_company, set_company
+def create_product(name, list_price, categories=None):
+ pool = Pool()
+ Template = pool.get('product.template')
+ Product = pool.get('product.product')
+ Uom = pool.get('product.uom')
+
+ unit, = Uom.search([('name', '=', 'Unit')])
+ template = Template(
+ name=name,
+ type='service',
+ list_price=list_price,
+ default_uom=unit,
+ products=None,
+ )
+ if categories:
+ template.categories = categories
+ template.save()
+ product = Product(template=template)
+ product.save()
+ return product
+
+
+def create_plan(lines):
+ pool = Pool()
+ Plan = pool.get('commission.plan')
+
+ commission_product = create_product("Commission", Decimal(10), [])
+ plan, = Plan.create([{
+ 'name': "Commission Plan",
+ 'commission_product': commission_product.id,
+ 'lines': [('create', lines)]
+
+ }])
+ return plan
+
+
class CommissionTestCase(ModuleTestCase):
'Test Commission module'
module = 'commission'
@@ -24,59 +60,58 @@ class CommissionTestCase(ModuleTestCase):
"Test plan with category"
pool = Pool()
Category = pool.get('product.category')
- Template = pool.get('product.template')
- Product = pool.get('product.product')
- Uom = pool.get('product.uom')
- Plan = pool.get('commission.plan')
category = Category(name="Category")
category.save()
- unit, = Uom.search([('name', '=', 'Unit')])
-
company = create_company()
with set_company(company):
- commission_template = Template(
- name="Commission",
- type='service',
- list_price=Decimal(10),
- cost_price=Decimal(3),
- default_uom=unit,
- products=None,
- )
- commission_template.save()
- commission_product = Product(template=commission_template)
- commission_product.save()
- template = Template(
- name="Template",
- list_price=Decimal(10),
- cost_price=Decimal(3),
- default_uom=unit,
- products=None,
- categories=[category],
- )
- template.save()
- product = Product(template=template)
- product.save()
-
- plan, = Plan.create([{
- 'name': "Commission Plan",
- 'commission_product': commission_product.id,
- 'lines': [('create', [{
- 'category': category.id,
- 'formula': 'amount * 0.8',
- }, {
- 'formula': 'amount',
- }])],
+ product = create_product("Other", Decimal(10), [category])
+
+ plan = create_plan([{
+ 'category': category.id,
+ 'formula': 'amount * 0.8',
+ }, {
+ 'formula': 'amount',
}])
self.assertEqual(plan.compute(Decimal(1), product), Decimal('0.8'))
+ template = product.template
template.categories = []
template.save()
self.assertEqual(plan.compute(Decimal(1), product), Decimal(1))
+ @with_transaction()
+ def test_plan_no_product(self):
+ "Test plan with no product"
+ pool = Pool()
+ Category = pool.get('product.category')
+ PlanLine = pool.get('commission.plan.line')
+
+ category = Category(name="Category")
+ category.save()
+
+ company = create_company()
+ with set_company(company):
+ product = create_product("Other", Decimal(10))
+ plan = create_plan([{
+ 'category': category.id,
+ 'formula': 'amount * 0.8',
+ }, {
+ 'product': product.id,
+ 'formula': 'amount * 0.7',
+ }, {
+ 'formula': 'amount',
+ }])
+
+ self.assertEqual(plan.compute(Decimal(1), None), Decimal(1))
+
+ PlanLine.delete(plan.lines[1:])
+
+ self.assertEqual(plan.compute(Decimal(1), None), None)
+
def suite():
suite = test_suite()
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..527d859
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,18 @@
+[tox]
+envlist = {py27,py34,py35,py36}-{sqlite,postgresql,mysql},pypy-{sqlite,postgresql}
+
+[testenv]
+commands = {envpython} setup.py test
+deps =
+ {py27,py34,py35,py36}-postgresql: psycopg2 >= 2.5
+ pypy-postgresql: psycopg2cffi >= 2.5
+ mysql: MySQL-python
+ sqlite: sqlitebck
+setenv =
+ sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}
+ postgresql: TRYTOND_DATABASE_URI={env:POSTGRESQL_URI:postgresql://}
+ mysql: TRYTOND_DATABASE_URI={env:MYSQL_URI:mysql://}
+ sqlite: DB_NAME={env:SQLITE_NAME::memory:}
+ postgresql: DB_NAME={env:POSTGRESQL_NAME:test}
+ mysql: DB_NAME={env:MYSQL_NAME:test}
+install_command = pip install --pre --find-links https://trydevpi.tryton.org/ {opts} {packages}
diff --git a/tryton.cfg b/tryton.cfg
index 2c08fdb..bdaf96b 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.4.0
+version=4.6.0
depends:
account
account_invoice
diff --git a/trytond_commission.egg-info/PKG-INFO b/trytond_commission.egg-info/PKG-INFO
index 05155fc..d998d00 100644
--- a/trytond_commission.egg-info/PKG-INFO
+++ b/trytond_commission.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-commission
-Version: 4.4.0
+Version: 4.6.0
Summary: Tryton module for commission
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/4.4/
+Download-URL: http://downloads.tryton.org/4.6/
Description: trytond_commission
==================
@@ -69,9 +69,9 @@ Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3.3
Classifier: Programming Language :: Python :: 3.4
Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3.6
Classifier: Programming Language :: Python :: Implementation :: CPython
Classifier: Programming Language :: Python :: Implementation :: PyPy
Classifier: Topic :: Office/Business
diff --git a/trytond_commission.egg-info/SOURCES.txt b/trytond_commission.egg-info/SOURCES.txt
index 818dd62..ab2d95a 100644
--- a/trytond_commission.egg-info/SOURCES.txt
+++ b/trytond_commission.egg-info/SOURCES.txt
@@ -1,15 +1,24 @@
+.drone.yml
+.hgtags
CHANGELOG
COPYRIGHT
INSTALL
LICENSE
MANIFEST.in
README
+__init__.py
account.xml
+commission.py
commission.xml
+invoice.py
invoice.xml
+party.py
+product.py
product.xml
+sale.py
sale.xml
setup.py
+tox.ini
tryton.cfg
./__init__.py
./account.xml
@@ -78,7 +87,9 @@ locale/pt_BR.po
locale/ru.po
locale/sl.po
locale/zh_CN.po
+tests/__init__.py
tests/scenario_commission.rst
+tests/test_commission.py
trytond_commission.egg-info/PKG-INFO
trytond_commission.egg-info/SOURCES.txt
trytond_commission.egg-info/dependency_links.txt
diff --git a/trytond_commission.egg-info/requires.txt b/trytond_commission.egg-info/requires.txt
index 1577d34..9e0bf8a 100644
--- a/trytond_commission.egg-info/requires.txt
+++ b/trytond_commission.egg-info/requires.txt
@@ -1,8 +1,8 @@
simpleeval
python-sql
-trytond_account >= 4.4, < 4.5
-trytond_account_invoice >= 4.4, < 4.5
-trytond_account_product >= 4.4, < 4.5
-trytond_party >= 4.4, < 4.5
-trytond_product >= 4.4, < 4.5
-trytond >= 4.4, < 4.5
+trytond_account >= 4.6, < 4.7
+trytond_account_invoice >= 4.6, < 4.7
+trytond_account_product >= 4.6, < 4.7
+trytond_party >= 4.6, < 4.7
+trytond_product >= 4.6, < 4.7
+trytond >= 4.6, < 4.7
--
tryton-modules-commission
More information about the tryton-debian-vcs
mailing list