Merge branch 'release/2.7.1'

pluginsGLPI · Sep 15, 2021 · ad14cf6 · ad14cf6
2 parents 77360f8 + 33a5e89
commit ad14cf6
Show file tree

Hide file tree

Showing 25 changed files with 140 additions and 129 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/inc/orderpayment.class.php b/inc/orderpayment.class.php
@@ -34,7 +34,7 @@
 // Class for a Dropdown
 class PluginOrderOrderPayment extends CommonDropdown {
 
-   public static $rightname = 'config'; //'plugin_order_order';
+   public static $rightname = 'plugin_order_order'; //'plugin_order_order';
 
    public static function getTypeName($nb = 0) {
       return __("Payment conditions", "order");

diff --git a/locales/cs_CZ.po b/locales/cs_CZ.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GLPI Plugin - Order\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-15 13:07+0000\n"
+"POT-Creation-Date: 2021-09-15 11:53+0000\n"
 "PO-Revision-Date: 2021-06-15 13:08+0000\n"
 "Last-Translator: Cédric Anne\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/teclib/glpi-plugin-order/language/cs_CZ/)\n"

diff --git a/locales/de_DE.mo b/locales/de_DE.mo
diff --git a/locales/de_DE.po b/locales/de_DE.po
@@ -5,13 +5,14 @@
 # Translators:
 # Bernd Bischof <[email protected]>, 2019
 # Thomas Spranger <[email protected]>, 2018
+# vollkommen irrelevant <[email protected]>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: GLPI Plugin - Order\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-15 13:07+0000\n"
-"PO-Revision-Date: 2021-06-15 13:08+0000\n"
-"Last-Translator: Cédric Anne\n"
+"POT-Creation-Date: 2021-09-15 11:53+0000\n"
+"PO-Revision-Date: 2021-08-26 13:04+0000\n"
+"Last-Translator: vollkommen irrelevant <[email protected]>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/teclib/glpi-plugin-order/language/de_DE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -76,7 +77,7 @@ msgstr ""
 
 #: hook.php:149 inc/accountsection.class.php:65 inc/order.class.php:1136
 msgid "Account section"
-msgstr ""
+msgstr "Rechnungsbereich"
 
 #: hook.php:150 front/order.form.php:417 front/preference.form.php:43
 #: front/order.php:33 front/menu.php:63 front/config.form.php:41
@@ -276,15 +277,15 @@ msgstr ""
 
 #: inc/surveysupplier.class.php:230 inc/surveysupplier.class.php:322
 msgid "Contacts availability"
-msgstr ""
+msgstr "Verfügbarkeit von Kontakten"
 
 #: inc/surveysupplier.class.php:238 inc/surveysupplier.class.php:328
 msgid "Quality of supplier intervention"
 msgstr ""
 
 #: inc/surveysupplier.class.php:245 inc/surveysupplier.class.php:334
 msgid "Reliability about annouced delays"
-msgstr ""
+msgstr "Zuverlässigkeit der angekündigten Bestellungen"
 
 #: inc/surveysupplier.class.php:257
 msgid "Final supplier note"
@@ -366,20 +367,20 @@ msgstr "Die Bestellnummer ist Pflicht!"
 
 #: inc/order.class.php:693 inc/order.class.php:769
 msgid "An account section is mandatory !"
-msgstr ""
+msgstr "Ein Rechnungsbereich ist zwingend!"
 
 #: inc/order.class.php:700 inc/order.class.php:763
 msgid ""
 "The order date must be within the dates entered for the selected budget."
-msgstr ""
+msgstr "Das Bestelldatum muss innerhalb des Datums des gewählten Budgets liegen."
 
 #: inc/order.class.php:812
 msgid "Go to configuration page"
-msgstr ""
+msgstr "Gehe zur Einstellungsseite"
 
 #: inc/order.class.php:816
 msgid "You must set up at least the order life cycle before starting."
-msgstr ""
+msgstr "Vor dem Starten musst du mindestens einen Bestellzyklus konfigurieren."
 
 #: inc/order.class.php:1075 inc/order_item.class.php:439
 #: inc/order_item.class.php:519 inc/config.class.php:112
@@ -393,7 +394,7 @@ msgstr "Due date overtaken"
 
 #: inc/order.class.php:1118
 msgid "Global discount to apply to items"
-msgstr ""
+msgstr "Globalrabatt für Artikel anwenden"
 
 #: inc/order.class.php:1306 inc/order.class.php:1895 inc/order.class.php:1993
 msgid "Price tax free"
@@ -505,11 +506,11 @@ msgstr "Verknüpfung entfernen"
 
 #: inc/order.class.php:2159
 msgid "Total orders related with this budget is greater than its value."
-msgstr ""
+msgstr "Der Bestellwert der Bestellungen ist grösser als das zugehörige Budget."
 
 #: inc/order.class.php:2164
 msgid "Total orders related with this budget is equal to its value."
-msgstr ""
+msgstr "Der Bestellwert der Bestellungen ist gleich dem zugehörigen Budget."
 
 #: inc/notificationtargetorder.class.php:47
 #: inc/notificationtargetorder.class.php:116
@@ -592,7 +593,7 @@ msgstr "Lieferanten wählen"
 
 #: inc/order_item.class.php:466
 msgid "Add to the order free items"
-msgstr ""
+msgstr "Füge der Order kostenlose Items hinzu."
 
 #: inc/order_item.class.php:480
 msgid "Add the reference"
@@ -637,7 +638,7 @@ msgstr "Bezahlstatus"
 
 #: inc/order_item.class.php:1486
 msgid "Paid value"
-msgstr ""
+msgstr "Bezahlwert"
 
 #: inc/order_item.class.php:1605 inc/order_item.class.php:1693
 #: inc/bill.class.php:47 inc/bill.class.php:135 inc/bill.class.php:409
@@ -671,20 +672,20 @@ msgstr "Kopie von"
 
 #: inc/reference.class.php:862
 msgid "Select the wanted item type"
-msgstr ""
+msgstr "Wähle den gewünschten Elementtyp"
 
 #: inc/reference.class.php:915 inc/reference.class.php:916
 #: inc/reference.class.php:934
 msgid "View by item type"
-msgstr ""
+msgstr "Ausgabe nach Elementtyp"
 
 #: inc/reference.class.php:991
 msgid "Copy reference"
 msgstr "Verweis kopieren"
 
 #: inc/orderstate.class.php:55 inc/billstate.class.php:48
 msgid "You cannot remove this status"
-msgstr ""
+msgstr "Du kannst diesen Status nicht entfernen."
 
 #: inc/orderstate.class.php:87
 msgid "Draft"
@@ -803,7 +804,7 @@ msgstr "Dokumente der Bestellung kopieren, wenn Objekt erstellt wird"
 
 #: inc/config.class.php:159
 msgid "Default heading when adding a document to an order"
-msgstr "Standard Überschrift, wenn Dokument zu einer Bestllung hinzugefügt wird"
+msgstr "Standard Überschrift wenn ein Dokument zu einer Bestellung hinzugefügt wird"
 
 #: inc/config.class.php:198
 msgid "Hide inactive budgets"
@@ -815,11 +816,11 @@ msgstr "Übermittle Budget-Änderungen an verknüpfte Geräte"
 
 #: inc/config.class.php:212
 msgid "Display account section on order form"
-msgstr ""
+msgstr "Zeige Rechnungsbereich auf dem Bestellformular."
 
 #: inc/config.class.php:219
 msgid "Set account section as mandatory on order form"
-msgstr ""
+msgstr "Erzwinge Rechnungsbereich im Bestellformular."
 
 #: inc/config.class.php:226
 msgid "Use free references"
@@ -878,7 +879,7 @@ msgstr "Standard Inventarnummer"
 
 #: inc/config.class.php:338
 msgid "Order lifecycle"
-msgstr ""
+msgstr "Bestellzyklus"
 
 #: inc/config.class.php:342
 msgid "State before validation"

diff --git a/locales/en_GB.mo b/locales/en_GB.mo
diff --git a/locales/en_GB.po b/locales/en_GB.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Cédric Anne, 2018
+# Cédric Anne, 2018,2021
 # 06c8e5f1ec78ded2ceb41498ec52b068, 2015
 # Johan Cwiklinski <[email protected]>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: GLPI Plugin - Order\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-15 13:07+0000\n"
-"PO-Revision-Date: 2021-06-15 13:08+0000\n"
+"POT-Creation-Date: 2021-09-15 11:53+0000\n"
+"PO-Revision-Date: 2021-09-15 11:59+0000\n"
 "Last-Translator: Cédric Anne\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/teclib/glpi-plugin-order/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -376,11 +376,11 @@ msgstr "The order date must be within the dates entered for the selected budget.
 
 #: inc/order.class.php:812
 msgid "Go to configuration page"
-msgstr ""
+msgstr "Go to configuration page"
 
 #: inc/order.class.php:816
 msgid "You must set up at least the order life cycle before starting."
-msgstr ""
+msgstr "You must set up at least the order life cycle before starting."
 
 #: inc/order.class.php:1075 inc/order_item.class.php:439
 #: inc/order_item.class.php:519 inc/config.class.php:112
@@ -394,7 +394,7 @@ msgstr "Due date overtaken"
 
 #: inc/order.class.php:1118
 msgid "Global discount to apply to items"
-msgstr ""
+msgstr "Global discount to apply to items"
 
 #: inc/order.class.php:1306 inc/order.class.php:1895 inc/order.class.php:1993
 msgid "Price tax free"

diff --git a/locales/es_ES.po b/locales/es_ES.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GLPI Plugin - Order\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-15 13:07+0000\n"
+"POT-Creation-Date: 2021-09-15 11:53+0000\n"
 "PO-Revision-Date: 2021-06-15 13:08+0000\n"
 "Last-Translator: Cédric Anne\n"
 "Language-Team: Spanish (Spain) (http://www.transifex.com/teclib/glpi-plugin-order/language/es_ES/)\n"

diff --git a/locales/fi_FI.po b/locales/fi_FI.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GLPI Plugin - Order\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-15 13:07+0000\n"
+"POT-Creation-Date: 2021-09-15 11:53+0000\n"
 "PO-Revision-Date: 2021-06-15 13:08+0000\n"
 "Last-Translator: Cédric Anne\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/teclib/glpi-plugin-order/language/fi_FI/)\n"

diff --git a/locales/fr_CA.po b/locales/fr_CA.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GLPI Plugin - Order\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-15 13:07+0000\n"
+"POT-Creation-Date: 2021-09-15 11:53+0000\n"
 "PO-Revision-Date: 2021-06-15 13:08+0000\n"
 "Last-Translator: Cédric Anne\n"
 "Language-Team: French (Canada) (http://www.transifex.com/teclib/glpi-plugin-order/language/fr_CA/)\n"

diff --git a/locales/fr_FR.mo b/locales/fr_FR.mo
diff --git a/locales/fr_FR.po b/locales/fr_FR.po
@@ -4,16 +4,16 @@
 # 
 # Translators:
 # alexandre delaunay <[email protected]>, 2018
-# Cédric Anne, 2018
+# Cédric Anne, 2018,2021
 # 06c8e5f1ec78ded2ceb41498ec52b068, 2015
 # Johan Cwiklinski <[email protected]>, 2016
 # Walid Nouh, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: GLPI Plugin - Order\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-15 13:07+0000\n"
-"PO-Revision-Date: 2021-06-15 13:08+0000\n"
+"POT-Creation-Date: 2021-09-15 11:53+0000\n"
+"PO-Revision-Date: 2021-09-15 12:02+0000\n"
 "Last-Translator: Cédric Anne\n"
 "Language-Team: French (France) (http://www.transifex.com/teclib/glpi-plugin-order/language/fr_FR/)\n"
 "MIME-Version: 1.0\n"
@@ -378,11 +378,11 @@ msgstr "La date de commande doit être comprise dans les dates déclarées pour
 
 #: inc/order.class.php:812
 msgid "Go to configuration page"
-msgstr ""
+msgstr "Aller à la page de configuration"
 
 #: inc/order.class.php:816
 msgid "You must set up at least the order life cycle before starting."
-msgstr ""
+msgstr "Vous devez définir le cycle de vie des commandes avant de commencer."
 
 #: inc/order.class.php:1075 inc/order_item.class.php:439
 #: inc/order_item.class.php:519 inc/config.class.php:112

diff --git a/locales/hr_HR.po b/locales/hr_HR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GLPI Plugin - Order\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-15 13:07+0000\n"
+"POT-Creation-Date: 2021-09-15 11:53+0000\n"
 "PO-Revision-Date: 2021-06-15 13:08+0000\n"
 "Last-Translator: Cédric Anne\n"
 "Language-Team: Croatian (Croatia) (http://www.transifex.com/teclib/glpi-plugin-order/language/hr_HR/)\n"

diff --git a/locales/it_IT.po b/locales/it_IT.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GLPI Plugin - Order\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-15 13:07+0000\n"
+"POT-Creation-Date: 2021-09-15 11:53+0000\n"
 "PO-Revision-Date: 2021-06-15 13:08+0000\n"
 "Last-Translator: Cédric Anne\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/teclib/glpi-plugin-order/language/it_IT/)\n"

diff --git a/locales/ko_KR.po b/locales/ko_KR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GLPI Plugin - Order\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-15 13:07+0000\n"
+"POT-Creation-Date: 2021-09-15 11:53+0000\n"
 "PO-Revision-Date: 2021-06-15 13:08+0000\n"
 "Last-Translator: Cédric Anne\n"
 "Language-Team: Korean (Korea) (http://www.transifex.com/teclib/glpi-plugin-order/language/ko_KR/)\n"

diff --git a/locales/order.pot b/locales/order.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-15 13:07+0000\n"
+"POT-Creation-Date: 2021-09-15 11:53+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"

diff --git a/locales/pl_PL.po b/locales/pl_PL.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GLPI Plugin - Order\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-15 13:07+0000\n"
+"POT-Creation-Date: 2021-09-15 11:53+0000\n"
 "PO-Revision-Date: 2021-06-15 13:08+0000\n"
 "Last-Translator: Cédric Anne\n"
 "Language-Team: Polish (Poland) (http://www.transifex.com/teclib/glpi-plugin-order/language/pl_PL/)\n"

diff --git a/locales/pt_BR.po b/locales/pt_BR.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GLPI Plugin - Order\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-15 13:07+0000\n"
+"POT-Creation-Date: 2021-09-15 11:53+0000\n"
 "PO-Revision-Date: 2021-06-15 13:08+0000\n"
 "Last-Translator: Cédric Anne\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/teclib/glpi-plugin-order/language/pt_BR/)\n"

diff --git a/locales/pt_PT.po b/locales/pt_PT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GLPI Plugin - Order\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-15 13:07+0000\n"
+"POT-Creation-Date: 2021-09-15 11:53+0000\n"
 "PO-Revision-Date: 2021-06-15 13:08+0000\n"
 "Last-Translator: Cédric Anne\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/teclib/glpi-plugin-order/language/pt_PT/)\n"

diff --git a/locales/ro_RO.po b/locales/ro_RO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GLPI Plugin - Order\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-15 13:07+0000\n"
+"POT-Creation-Date: 2021-09-15 11:53+0000\n"
 "PO-Revision-Date: 2021-06-15 13:08+0000\n"
 "Last-Translator: Cédric Anne\n"
 "Language-Team: Romanian (Romania) (http://www.transifex.com/teclib/glpi-plugin-order/language/ro_RO/)\n"

diff --git a/locales/ru_RU.po b/locales/ru_RU.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GLPI Plugin - Order\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-15 13:07+0000\n"
+"POT-Creation-Date: 2021-09-15 11:53+0000\n"
 "PO-Revision-Date: 2021-06-15 13:08+0000\n"
 "Last-Translator: Cédric Anne\n"
 "Language-Team: Russian (Russia) (http://www.transifex.com/teclib/glpi-plugin-order/language/ru_RU/)\n"

diff --git a/locales/tr_TR.po b/locales/tr_TR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GLPI Plugin - Order\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-15 13:07+0000\n"
+"POT-Creation-Date: 2021-09-15 11:53+0000\n"
 "PO-Revision-Date: 2021-06-15 15:36+0000\n"
 "Last-Translator: Kaya Zeren <[email protected]>\n"
 "Language-Team: Turkish (Turkey) (http://www.transifex.com/teclib/glpi-plugin-order/language/tr_TR/)\n"

diff --git a/locales/zh_CN.po b/locales/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GLPI Plugin - Order\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-15 13:07+0000\n"
+"POT-Creation-Date: 2021-09-15 11:53+0000\n"
 "PO-Revision-Date: 2021-06-15 13:08+0000\n"
 "Last-Translator: Cédric Anne\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/teclib/glpi-plugin-order/language/zh_CN/)\n"

diff --git a/plugin.xml b/plugin.xml
@@ -29,6 +29,11 @@
       <author>Benjamin Fontan</author>
    </authors>
    <versions>
+      <version>
+          <num>2.7.1</num>
+          <compatibility>~9.5.0</compatibility>
+          <download_url>https://github.com/pluginsGLPI/order/releases/download/2.7.1/glpi-order-2.7.1.tar.bz2</download_url>
+      </version>
       <version>
           <num>2.7.0</num>
           <compatibility>~9.5.0</compatibility>