[tryton-debian-vcs] tryton-modules-project-revenue branch debian updated. debian/4.2.0-1-2-ged5d8cd

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Wed Jun 7 13:34:56 UTC 2017


The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-project-revenue.git;a=commitdiff;h=debian/4.2.0-1-2-ged5d8cd

commit ed5d8cd9a8991e831b4f7fbf663531ad56867ae2
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Jun 7 15:26:52 2017 +0200

    Merging upstream version 4.4.0.

diff --git a/CHANGELOG b/CHANGELOG
index 4ac278d..55f4203 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.4.0 - 2017-05-01
+* Bug fixes (see mercurial logs for details)
+
 Version 4.2.0 - 2016-11-28
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index 00cf5e6..0a0f6e2 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2008-2016 Cédric Krier.
-Copyright (C) 2008-2016 B2CK SPRL.
+Copyright (C) 2008-2017 Cédric Krier.
+Copyright (C) 2008-2017 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 7b68409..ffc14ce 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond_project_revenue
-Version: 4.2.0
+Version: 4.4.0
 Summary: Tryton module to add revenue on project
 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.2/
+Download-URL: http://downloads.tryton.org/4.4/
 Description: trytond_project_revenue
         =======================
         
@@ -52,7 +52,7 @@ Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Financial and Insurance Industry
 Classifier: Intended Audience :: Legal Industry
 Classifier: Intended Audience :: Manufacturing
-Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
 Classifier: Natural Language :: Bulgarian
 Classifier: Natural Language :: Catalan
 Classifier: Natural Language :: Chinese (Simplified)
diff --git a/locale/bg.po b/locale/bg.po
index e1c2538..36bab42 100644
--- a/locale/bg.po
+++ b/locale/bg.po
@@ -35,3 +35,7 @@ msgstr "Дейност"
 msgctxt "view:project.work:"
 msgid "Purchases"
 msgstr "Покупки"
+
+msgctxt "view:purchase.line:"
+msgid "Project"
+msgstr ""
diff --git a/locale/ca.po b/locale/ca.po
index d343401..54be845 100644
--- a/locale/ca.po
+++ b/locale/ca.po
@@ -33,3 +33,7 @@ msgstr "Temps del treball"
 msgctxt "view:project.work:"
 msgid "Purchases"
 msgstr "Compres"
+
+msgctxt "view:purchase.line:"
+msgid "Project"
+msgstr "Projecte"
diff --git a/locale/cs.po b/locale/cs.po
index 281d93e..c315cf8 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -33,3 +33,7 @@ msgstr ""
 msgctxt "view:project.work:"
 msgid "Purchases"
 msgstr ""
+
+msgctxt "view:purchase.line:"
+msgid "Project"
+msgstr ""
diff --git a/locale/de.po b/locale/de.po
index d10a356..39c49c9 100644
--- a/locale/de.po
+++ b/locale/de.po
@@ -33,3 +33,7 @@ msgstr "Aufgabe Aufwand"
 msgctxt "view:project.work:"
 msgid "Purchases"
 msgstr "Einkäufe"
+
+msgctxt "view:purchase.line:"
+msgid "Project"
+msgstr "Projekt"
diff --git a/locale/es.po b/locale/es.po
index abb2a90..c1d2041 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -33,3 +33,7 @@ msgstr "Tiempo del trabajo"
 msgctxt "view:project.work:"
 msgid "Purchases"
 msgstr "Compras"
+
+msgctxt "view:purchase.line:"
+msgid "Project"
+msgstr "Proyecto"
diff --git a/locale/es_419.po b/locale/es_419.po
index 60561da..9e1b1ba 100644
--- a/locale/es_419.po
+++ b/locale/es_419.po
@@ -33,3 +33,7 @@ msgstr "Esfuerzo de trabajo"
 msgctxt "view:project.work:"
 msgid "Purchases"
 msgstr ""
+
+msgctxt "view:purchase.line:"
+msgid "Project"
+msgstr ""
diff --git a/locale/fr.po b/locale/fr.po
index 7892424..1ab22af 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -33,3 +33,7 @@ msgstr "Effort de travail"
 msgctxt "view:project.work:"
 msgid "Purchases"
 msgstr "Achats"
+
+msgctxt "view:purchase.line:"
+msgid "Project"
+msgstr "Projet"
diff --git a/locale/hu_HU.po b/locale/hu_HU.po
index 555b228..94cd68a 100644
--- a/locale/hu_HU.po
+++ b/locale/hu_HU.po
@@ -36,3 +36,7 @@ msgstr ""
 msgctxt "view:project.work:"
 msgid "Purchases"
 msgstr ""
+
+msgctxt "view:purchase.line:"
+msgid "Project"
+msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 0f76862..a66cc7b 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -36,3 +36,7 @@ msgstr ""
 msgctxt "view:project.work:"
 msgid "Purchases"
 msgstr ""
+
+msgctxt "view:purchase.line:"
+msgid "Project"
+msgstr ""
diff --git a/locale/ja_JP.po b/locale/ja_JP.po
index 281d93e..c315cf8 100644
--- a/locale/ja_JP.po
+++ b/locale/ja_JP.po
@@ -33,3 +33,7 @@ msgstr ""
 msgctxt "view:project.work:"
 msgid "Purchases"
 msgstr ""
+
+msgctxt "view:purchase.line:"
+msgid "Project"
+msgstr ""
diff --git a/locale/lo.po b/locale/lo.po
index 5a6c91d..bc7836f 100644
--- a/locale/lo.po
+++ b/locale/lo.po
@@ -4,37 +4,36 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "field:project.work,cost:"
 msgid "Cost"
-msgstr ""
+msgstr "ລາຄາ"
 
-#, fuzzy
 msgctxt "field:project.work,currency_digits:"
 msgid "Currency Digits"
-msgstr "ໂຕເລກສະກຸນເງິນ"
+msgstr "ເລກເສດສະກຸນເງິນ"
 
-#, fuzzy
 msgctxt "field:project.work,list_price:"
 msgid "List Price"
 msgstr "ລາຍການລາຄາ"
 
-#, fuzzy
 msgctxt "field:project.work,product:"
 msgid "Product"
 msgstr "ຜະລິດຕະພັນ"
 
 msgctxt "field:project.work,purchase_lines:"
 msgid "Purchase Lines"
-msgstr ""
+msgstr "ລາຍການສັ່ງຊື້"
 
-#, fuzzy
 msgctxt "field:project.work,revenue:"
 msgid "Revenue"
 msgstr "ລາຍຮັບ"
 
 msgctxt "field:purchase.line,work:"
 msgid "Work Effort"
-msgstr ""
+msgstr "ວຽກສູ້ຊົນ"
 
-#, fuzzy
 msgctxt "view:project.work:"
 msgid "Purchases"
 msgstr "ການຈັດຊື້"
+
+msgctxt "view:purchase.line:"
+msgid "Project"
+msgstr "ໂຄງການ"
diff --git a/locale/lt.po b/locale/lt.po
index 281d93e..c315cf8 100644
--- a/locale/lt.po
+++ b/locale/lt.po
@@ -33,3 +33,7 @@ msgstr ""
 msgctxt "view:project.work:"
 msgid "Purchases"
 msgstr ""
+
+msgctxt "view:purchase.line:"
+msgid "Project"
+msgstr ""
diff --git a/locale/nl.po b/locale/nl.po
index 1ededcb..4275270 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -37,3 +37,7 @@ msgstr ""
 msgctxt "view:project.work:"
 msgid "Purchases"
 msgstr ""
+
+msgctxt "view:purchase.line:"
+msgid "Project"
+msgstr ""
diff --git a/locale/pl.po b/locale/pl.po
index 281d93e..c315cf8 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -33,3 +33,7 @@ msgstr ""
 msgctxt "view:project.work:"
 msgid "Purchases"
 msgstr ""
+
+msgctxt "view:purchase.line:"
+msgid "Project"
+msgstr ""
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 6bf091c..f11530a 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -33,3 +33,7 @@ msgstr "Esforço de trabalho"
 msgctxt "view:project.work:"
 msgid "Purchases"
 msgstr "Compras"
+
+msgctxt "view:purchase.line:"
+msgid "Project"
+msgstr "Projeto"
diff --git a/locale/ru.po b/locale/ru.po
index ab482ce..3cbe4ed 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -35,3 +35,7 @@ msgstr "Рабочие затраты"
 msgctxt "view:project.work:"
 msgid "Purchases"
 msgstr "Покупки"
+
+msgctxt "view:purchase.line:"
+msgid "Project"
+msgstr ""
diff --git a/locale/sl.po b/locale/sl.po
index ef8f148..c77dedf 100644
--- a/locale/sl.po
+++ b/locale/sl.po
@@ -33,3 +33,7 @@ msgstr "Ocena naloge"
 msgctxt "view:project.work:"
 msgid "Purchases"
 msgstr "Nabavni nalogi"
+
+msgctxt "view:purchase.line:"
+msgid "Project"
+msgstr "Projekt"
diff --git a/locale/zh_CN.po b/locale/zh_CN.po
index 281d93e..c315cf8 100644
--- a/locale/zh_CN.po
+++ b/locale/zh_CN.po
@@ -33,3 +33,7 @@ msgstr ""
 msgctxt "view:project.work:"
 msgid "Purchases"
 msgstr ""
+
+msgctxt "view:purchase.line:"
+msgid "Project"
+msgstr ""
diff --git a/setup.py b/setup.py
index ca15223..c4372c1 100644
--- a/setup.py
+++ b/setup.py
@@ -79,7 +79,7 @@ setup(name=name,
         'Intended Audience :: Financial and Insurance Industry',
         'Intended Audience :: Legal Industry',
         'Intended Audience :: Manufacturing',
-        'License :: OSI Approved :: GNU General Public License (GPL)',
+        'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',
         'Natural Language :: Bulgarian',
         'Natural Language :: Catalan',
         'Natural Language :: Chinese (Simplified)',
diff --git a/tryton.cfg b/tryton.cfg
index 48b95d3..961976a 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=4.2.0
+version=4.4.0
 depends:
     ir
     project
diff --git a/trytond_project_revenue.egg-info/PKG-INFO b/trytond_project_revenue.egg-info/PKG-INFO
index 93e056a..847befc 100644
--- a/trytond_project_revenue.egg-info/PKG-INFO
+++ b/trytond_project_revenue.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond-project-revenue
-Version: 4.2.0
+Version: 4.4.0
 Summary: Tryton module to add revenue on project
 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.2/
+Download-URL: http://downloads.tryton.org/4.4/
 Description: trytond_project_revenue
         =======================
         
@@ -52,7 +52,7 @@ Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Financial and Insurance Industry
 Classifier: Intended Audience :: Legal Industry
 Classifier: Intended Audience :: Manufacturing
-Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
 Classifier: Natural Language :: Bulgarian
 Classifier: Natural Language :: Catalan
 Classifier: Natural Language :: Chinese (Simplified)
diff --git a/trytond_project_revenue.egg-info/requires.txt b/trytond_project_revenue.egg-info/requires.txt
index ad61052..60dc4e6 100644
--- a/trytond_project_revenue.egg-info/requires.txt
+++ b/trytond_project_revenue.egg-info/requires.txt
@@ -1,7 +1,7 @@
 python-sql
-trytond_project >= 4.2, < 4.3
-trytond_timesheet >= 4.2, < 4.3
-trytond_timesheet_cost >= 4.2, < 4.3
-trytond_company >= 4.2, < 4.3
-trytond_product >= 4.2, < 4.3
-trytond >= 4.2, < 4.3
+trytond_project >= 4.4, < 4.5
+trytond_timesheet >= 4.4, < 4.5
+trytond_timesheet_cost >= 4.4, < 4.5
+trytond_company >= 4.4, < 4.5
+trytond_product >= 4.4, < 4.5
+trytond >= 4.4, < 4.5
diff --git a/view/purchase_line_form.xml b/view/purchase_line_form.xml
index c539d19..08e1e5c 100644
--- a/view/purchase_line_form.xml
+++ b/view/purchase_line_form.xml
@@ -3,9 +3,10 @@
 this repository contains the full copyright notices and license terms. -->
 <data>
     <xpath
-        expr="/form/notebook/page[@id='general']/field[@name='delivery_date']"
-        position="after">
-        <label name="work"/>
-        <field name="work"/>
+        expr="/form/notebook/page[@id='general']" position="after">
+        <page string="Project" id="project">
+            <label name="work"/>
+            <field name="work"/>
+        </page>
     </xpath>
 </data>
-- 
tryton-modules-project-revenue



More information about the tryton-debian-vcs mailing list