From 277784af2525b9a35a5540b1b65e62123483639d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 13 Mar 2013 19:55:21 +0100 Subject: [PATCH] New: Start to work on a cron module --- htdocs/core/modules/modCron.class.php | 124 ++++ htdocs/cron/admin/cron.php | 132 ++++ htdocs/langs/ar_SA/admin.lang | 4 - htdocs/langs/bg_BG/admin.lang | 4 - htdocs/langs/ca_ES/admin.lang | 4 - htdocs/langs/da_DK/admin.lang | 4 - htdocs/langs/de_AT/admin.lang | 4 - htdocs/langs/de_DE/admin.lang | 4 - htdocs/langs/el_GR/admin.lang | 1 - htdocs/langs/en_US/admin.lang | 6 +- htdocs/langs/en_US/cron.lang | 6 + htdocs/langs/es_ES/admin.lang | 4 - htdocs/langs/et_EE/admin.lang | 4 - htdocs/langs/fa_IR/admin.lang | 4 - htdocs/langs/fi_FI/admin.lang | 4 - htdocs/langs/fr_FR/admin.lang | 6 +- htdocs/langs/fr_FR/cron.lang | 6 + htdocs/langs/he_IL/admin.lang | 4 - htdocs/langs/hu_HU/admin.lang | 4 - htdocs/langs/is_IS/admin.lang | 4 - htdocs/langs/it_IT/admin.lang | 2 - htdocs/langs/ja_JP/admin.lang | 4 - htdocs/langs/nb_NO/admin.lang | 4 - htdocs/langs/nl_BE/admin.lang | 4 - htdocs/langs/nl_NL/admin.lang | 4 - htdocs/langs/pl_PL/admin.lang | 4 - htdocs/langs/pt_BR/admin.lang | 4 - htdocs/langs/pt_PT/admin.lang | 2 - htdocs/langs/ro_RO/admin.lang | 4 - htdocs/langs/ru_RU/admin.lang | 4 - htdocs/langs/sl_SI/admin.lang | 4 - htdocs/langs/sv_SE/admin.lang | 4 - htdocs/langs/tr_TR/admin.lang | 4 - htdocs/langs/zh_CN/admin.lang | 4 - htdocs/langs/zh_TW/admin.lang | 4 - test/soapui/Dolibarr-soapui-project.xml | 925 ++++++++++++++++++++++-- 36 files changed, 1155 insertions(+), 159 deletions(-) create mode 100644 htdocs/core/modules/modCron.class.php create mode 100644 htdocs/cron/admin/cron.php create mode 100644 htdocs/langs/en_US/cron.lang create mode 100644 htdocs/langs/fr_FR/cron.lang diff --git a/htdocs/core/modules/modCron.class.php b/htdocs/core/modules/modCron.class.php new file mode 100644 index 00000000000..00e2a419e98 --- /dev/null +++ b/htdocs/core/modules/modCron.class.php @@ -0,0 +1,124 @@ + + * + * 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 . + */ + +/** + * \defgroup webservices Module webservices + * \brief Module to enable the Dolibarr server of web services + * \file htdocs/core/modules/modCron.class.php + * \ingroup cron + * \brief File to describe cron module + */ +include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php'; + +/** + * Class to describe a Cron module + */ +class modCron extends DolibarrModules +{ + + /** + * Constructor. Define names, constants, directories, boxes, permissions + * + * @param DoliDB $db Database handler + */ + function __construct($db) + { + $this->db = $db; + $this->numero = 2300; + + // Family can be 'crm','financial','hr','projects','products','ecm','technic','other' + // It is used to group modules in module setup page + $this->family = "technic"; + // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module) + $this->name = preg_replace('/^mod/i','',get_class($this)); + $this->description = "Enable the Dolibarr cron service"; + $this->version = 'experimental'; // 'experimental' or 'dolibarr' or version + // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase) + $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name); + // Where to store the module in setup page (0=common,1=interface,2=others,3=very specific) + $this->special = 2; + // Name of image file used for this module. + $this->picto='technic'; + + // Data directories to create when module is enabled + $this->dirs = array(); + + // Config pages + //------------- + $this->config_page_url = array("cron.php@cron"); + + // Dependancies + //------------- + $this->depends = array(); + $this->requiredby = array(); + $this->langfiles = array("cron"); + + // Constantes + //----------- + $this->const = array(); + + // New pages on tabs + // ----------------- + $this->tabs = array(); + + // Boxes + //------ + $this->boxes = array(); + + // Permissions + //------------ + $this->rights = array(); + $this->rights_class = 'cron'; + $r=0; + } + + + /** + * Function called when module is enabled. + * The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database. + * It also creates data directories + * + * @param string $options Options when enabling module ('', 'noboxes') + * @return int 1 if OK, 0 if KO + */ + function init($options='') + { + // Prevent pb of modules not correctly disabled + //$this->remove($options); + + $sql = array(); + + return $this->_init($sql,$options); + } + + /** + * Function called when module is disabled. + * Remove from database constants, boxes and permissions from Dolibarr database. + * Data directories are not deleted + * + * @param string $options Options when enabling module ('', 'noboxes') + * @return int 1 if OK, 0 if KO + */ + function remove($options='') + { + $sql = array(); + + return $this->_remove($sql,$options); + } + +} +?> diff --git a/htdocs/cron/admin/cron.php b/htdocs/cron/admin/cron.php new file mode 100644 index 00000000000..887f914dbe9 --- /dev/null +++ b/htdocs/cron/admin/cron.php @@ -0,0 +1,132 @@ + + * Copyright (C) 2005-2013 Laurent Destailleur + * Copyright (C) 2011 Juanjo Menent + * Copyright (C) 2012 Regis Houssin + * + * 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 . + */ + +/** + * \file htdocs/cron/admin/cron.php + * \ingroup cron + * \brief Page to setup cron module + */ + +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; + +$langs->load("admin"); +$langs->load("cron"); + +if (! $user->admin) + accessforbidden(); + +$actionsave=GETPOST("save"); + +// Sauvegardes parametres +if ($actionsave) +{ + $i=0; + + $db->begin(); + + $i+=dolibarr_set_const($db,'CRON_KEY',trim(GETPOST("CRON_KEY")),'chaine',0,'',$conf->entity); + + if ($i >= 1) + { + $db->commit(); + setEventMessage($langs->trans("SetupSaved")); + } + else + { + $db->rollback(); + setEventMessage($langs->trans("Error"), 'errors'); + } +} + + +/* + * View + */ + +llxHeader(); + +$linkback=''.$langs->trans("BackToModuleList").''; +print_fiche_titre($langs->trans("CronSetup"),$linkback,'setup'); + +print $langs->trans("CronDesc")."
\n"; +print "
\n"; + +print '
'; +print ''; +print ''; + +print ''; +print ""; +print ""; +//print ""; +print ""; +print ""; + +print ''; +print ''; +print ''; +print ''; +print ''; + +print '
".$langs->trans("Parameter")."".$langs->trans("Value")."".$langs->trans("Examples")." 
'.$langs->trans("KeyForCronAccess").''; +if (! empty($conf->use_javascript_ajax)) + print ' '.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_token" class="linkobject"'); +print ' 
'; + +print '
'; +print ''; +print '
'; + +print '
'; + +print '

'; + + +// Cron launch +print ''.$langs->trans("URLToLaunchCronJobs").':
'; +$url=DOL_MAIN_URL_ROOT.'/cron/cron_run_jobs.php'.(empty($conf->global->CRON_KEY)?'':'?securitykey='.$conf->global->CRON_KEY); +print img_picto('','object_globe.png').' '.$url."
\n"; +print '
'; + + +print '
'; + +if (! empty($conf->use_javascript_ajax)) +{ + print "\n".''; +} + + +llxFooter(); +$db->close(); +?> diff --git a/htdocs/langs/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang index 1869540d58b..722231818d2 100644 --- a/htdocs/langs/ar_SA/admin.lang +++ b/htdocs/langs/ar_SA/admin.lang @@ -333,10 +333,6 @@ Module1400Name=المحاسبة Module1400Desc=المحاسبة الإدارية (ضعف الأحزاب) Module1780Name=الفئات Module1780Desc=الفئات إدارة المنتجات والموردين والزبائن) -Module2200Name=الإقراض الإنسان -Module2200Desc=الإقراض لإدارة الحقوق -Module2300Name=القوائم -Module2300Desc=القوائم إدارة Module2400Name=جدول الأعمال Module2400Desc=الأعمال / الإدارة المهام وجدول الأعمال Module2500Name=إدارة المحتوى الإلكتروني diff --git a/htdocs/langs/bg_BG/admin.lang b/htdocs/langs/bg_BG/admin.lang index 34dfd27832a..812767e5ab4 100644 --- a/htdocs/langs/bg_BG/admin.lang +++ b/htdocs/langs/bg_BG/admin.lang @@ -438,10 +438,6 @@ Module1780Name=Категории Module1780Desc=Категория управление (продукти, доставчици и клиенти) Module2000Name=WYSIWYG редактор Module2000Desc=Оставя се да редактирате някакъв текст, чрез използване на усъвършенствана редактор -Module2200Name=Кредити права -Module2200Desc=Заеми за управление на права -Module2300Name=Менюта -Module2300Desc=Меню управление Module2400Name=Дневен ред Module2400Desc=Събития / задачи и управление на дневен ред Module2500Name=Управление на електронно съдържание diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang index 70af2933354..89761b3eba5 100644 --- a/htdocs/langs/ca_ES/admin.lang +++ b/htdocs/langs/ca_ES/admin.lang @@ -450,10 +450,6 @@ Module1780Name=Categories Module1780Desc=Gestió de categories (productes, proveïdors i clients) Module2000Name=Editor WYSIWYG Module2000Desc=Permet l'edició de certes zones de text mitjançant un editor avançat -Module2200Name=Dret de préstecs -Module2200Desc=Gestió dels drets de préstecs -Module2300Name=Menús -Module2300Desc=Administració dels menús per base de dades Module2400Name=Agenda Module2400Desc=Gestió de l'agenda i de les accions Module2500Name=Gestió Electrònica de Documents diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang index a710c6cfda8..5dc84bdef04 100644 --- a/htdocs/langs/da_DK/admin.lang +++ b/htdocs/langs/da_DK/admin.lang @@ -305,10 +305,6 @@ Module1400Name=Regnskabsmæssig ekspert Module1400Desc=Regnskabsmæssig forvaltning for eksperter (dobbelt parterne) Module1780Name=Kategorier Module1780Desc=Kategorier 'forvaltning (produkter, leverandører og kunder) -Module2200Name=Udlånsrettighederne -Module2200Desc=Udlånsrettighederne forvaltning -Module2300Name=Menuer -Module2300Desc=Menuer 'ledelse Module2400Name=Agenda Module2400Desc=Handlinger / opgaver og dagsorden forvaltning Module2500Name=Elektronisk Content Management diff --git a/htdocs/langs/de_AT/admin.lang b/htdocs/langs/de_AT/admin.lang index fb5b1ee498f..50b20c94796 100644 --- a/htdocs/langs/de_AT/admin.lang +++ b/htdocs/langs/de_AT/admin.lang @@ -300,10 +300,6 @@ Module1400Name=Buchhaltung Module1400Desc=Buchhaltung für Experten (doppelte Buchhaltung) Module1780Name=Kategorien Module1780Desc=Kategorienverwaltung (Produkte, Lieferanten und Kunden) -Module2200Name=Verleihrechte -Module2200Desc=Verleihrechteverwaltung -Module2300Name=Menüs -Module2300Desc=Menüverwaltung Module2400Name=Agenda Module2400Desc=Maßnahmen/Aufgaben und Agendaverwaltung Module2500Name=Inhaltsverwaltung(ECM) diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang index 6f27f1b4c5f..7c56963166b 100644 --- a/htdocs/langs/de_DE/admin.lang +++ b/htdocs/langs/de_DE/admin.lang @@ -421,10 +421,6 @@ Module1780Name=Kategorien Module1780Desc=Kategorienverwaltung (Produkte, Lieferanten und Kunden) Module2000Name=FCKeditor Module2000Desc=WYSIWYG-Editor -Module2200Name=Verleihrechte -Module2200Desc=Verleihrechteverwaltung -Module2300Name=Menüs -Module2300Desc=Menüverwaltung Module2400Name=Agenda Module2400Desc=Maßnahmen/Aufgaben und Agendaverwaltung Module2500Name=Inhaltsverwaltung(ECM) diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang index 1250cfadf24..9628acf2211 100644 --- a/htdocs/langs/el_GR/admin.lang +++ b/htdocs/langs/el_GR/admin.lang @@ -181,7 +181,6 @@ Module330Name=Σελιδοδείκτες Module400Name=Έργα Module700Name=Δωρεές Module1780Name=Κατηγορίες -Module2300Name=Μενού Module2400Name=Ατζέντα Module50100Name=Σημείο Πωλήσεων Permission19=Διαγραφή τιμολογίων diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 4c518583b3e..4daf950fcde 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -454,10 +454,8 @@ Module1780Name=Categories Module1780Desc=Category management (products, suppliers and customers) Module2000Name=WYSIWYG editor Module2000Desc=Allow to edit some text area using an advanced editor -Module2200Name=Lending rights -Module2200Desc=Lending rights management -Module2300Name=Menus -Module2300Desc=Menu management +Module2300Name=Cron +Module2300Desc=Scheduled task management Module2400Name=Agenda Module2400Desc=Events/tasks and agenda management Module2500Name=Electronic Content Management diff --git a/htdocs/langs/en_US/cron.lang b/htdocs/langs/en_US/cron.lang new file mode 100644 index 00000000000..64859a0de3f --- /dev/null +++ b/htdocs/langs/en_US/cron.lang @@ -0,0 +1,6 @@ +# Dolibarr language file - en_US - cron +CHARSET=UTF-8 +CronSetup=Cron scheduler setup +CronDesc=This page can be used to setup options of the scheduler manager +URLToLaunchCronJobs=URL to launch cron jobs +KeyForCronAccess=Security key for URL to launch cron jobs \ No newline at end of file diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang index 42d01cae8d9..6c6239b9522 100644 --- a/htdocs/langs/es_ES/admin.lang +++ b/htdocs/langs/es_ES/admin.lang @@ -451,10 +451,6 @@ Module1780Name=Categorías Module1780Desc=Gestión de categorías (productos, proveedores y clientes) Module2000Name=Editor WYSIWYG Module2000Desc=Permite la edición de ciertas zonas de texto mediante un editor avanzado -Module2200Name=Derecho de préstamos -Module2200Desc=Gestión de los derechos de préstamos -Module2300Name=Menús -Module2300Desc=Administración de los menús por base de datos Module2400Name=Agenda Module2400Desc=Gestión de la agenda y de las acciones Module2500Name=Gestión Electrónica de Documentos diff --git a/htdocs/langs/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang index 763bc5b6eac..b42ccb0a190 100644 --- a/htdocs/langs/et_EE/admin.lang +++ b/htdocs/langs/et_EE/admin.lang @@ -418,10 +418,6 @@ Module1780Name=Kategooriad Module1780Desc=Kategoorias juhtkond (toodete, tarnijate ja tarbijate) Module2000Name=WYSIWYG editor Module2000Desc=Võimaldavad muuta natuke teksti ala, kasutades täiustatud toimetaja -Module2200Name=Laenutusõigust -Module2200Desc=Laenutusõigust juhtimine -Module2300Name=Menüüd -Module2300Desc=Menüü juhtkond Module2400Name=Päevakord Module2400Desc=Events / ülesanded ja kava haldamise Module2500Name=Electronic Content Management diff --git a/htdocs/langs/fa_IR/admin.lang b/htdocs/langs/fa_IR/admin.lang index f3a038532d4..2f703f61e92 100644 --- a/htdocs/langs/fa_IR/admin.lang +++ b/htdocs/langs/fa_IR/admin.lang @@ -341,10 +341,6 @@ Module1400Name=المحاسبة Module1400Desc=المحاسبة الإدارية (ضعف الأحزاب) Module1780Name=الفئات Module1780Desc=الفئات إدارة المنتجات والموردين والزبائن) -Module2200Name=الإقراض الإنسان -Module2200Desc=الإقراض لإدارة الحقوق -Module2300Name=القوائم -Module2300Desc=القوائم إدارة Module2400Name=جدول الأعمال Module2400Desc=الأعمال / الإدارة المهام وجدول الأعمال Module2500Name=إدارة المحتوى الإلكتروني diff --git a/htdocs/langs/fi_FI/admin.lang b/htdocs/langs/fi_FI/admin.lang index 06cd7ef8817..a79d9c9adbf 100644 --- a/htdocs/langs/fi_FI/admin.lang +++ b/htdocs/langs/fi_FI/admin.lang @@ -303,10 +303,6 @@ Module1400Name=Kirjanpidon asiantuntija Module1400Desc=Kirjanpidon hallinta asiantuntijoille (double osapuolet) Module1780Name=Kategoriat Module1780Desc=Kategoriat hallintaa (tuotteet, tavarantoimittajat ja asiakkaat) -Module2200Name=Lainausoikeuksia -Module2200Desc=Luotonanto oikeuksien hallinta -Module2300Name=Menut -Module2300Desc=Valikot hallinto Module2400Name=Agenda Module2400Desc=Toimet / tehtävät ja esityslistan hallinta Module2500Name=Sähköinen Content Management diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index d71f04ac698..2f4782dd3bb 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -452,10 +452,8 @@ Module1780Name= Catégories Module1780Desc= Gestion des catégories (produits, fournisseurs, clients et adhérents) Module2000Name= Editeur WYSIWYG Module2000Desc= Permet la saisie de certaines zones de textes grace à un éditeur avancé -Module2200Name= Droit de prêts -Module2200Desc= Gestion du droit de prêts -Module2300Name= Menus -Module2300Desc= Administration des menus par base de données +Module2300Name= Cron +Module2300Desc= Gestionnaire de taches programmées Module2400Name= Agenda Module2400Desc= Gestion des actions (événements et tâches) et de l'agenda Module2500Name= Gestion Electronique de Documents diff --git a/htdocs/langs/fr_FR/cron.lang b/htdocs/langs/fr_FR/cron.lang new file mode 100644 index 00000000000..a5f3e44dad2 --- /dev/null +++ b/htdocs/langs/fr_FR/cron.lang @@ -0,0 +1,6 @@ +# Dolibarr language file - fr_FR - cron +CHARSET=UTF-8 +CronSetup=Configuration du séquenceur de taches +CronDesc=Cette page permet de configurer certaines options du séquenceur de taches +URLToLaunchCronJobs=URL pour lancer les taches automatiques +KeyForCronAccess=Clé de sécurité pour l'URL de lancement des taches automatiques \ No newline at end of file diff --git a/htdocs/langs/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang index c84af3ec434..4c9f6a55ec0 100644 --- a/htdocs/langs/he_IL/admin.lang +++ b/htdocs/langs/he_IL/admin.lang @@ -418,10 +418,6 @@ Module1780Name=קטגוריות Module1780Desc=Categorie ההנהלה (מוצרים, ספקים ולקוחות) Module2000Name=עורך WYSIWYG Module2000Desc=אפשר לערוך כמה אזור הטקסט באמצעות עורך מתקדם -Module2200Name=ההלוואות זכויות -Module2200Desc=זכויות ההלוואות וניהול -Module2300Name=תפריטים -Module2300Desc=תפריט של ההנהלה Module2400Name=סדר היום Module2400Desc=אירועים / משימות וניהול סדר היום Module2500Name=תוכן אלקטרוני ניהול diff --git a/htdocs/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang index 0445f9fb8e9..fd1a1715e7a 100644 --- a/htdocs/langs/hu_HU/admin.lang +++ b/htdocs/langs/hu_HU/admin.lang @@ -418,10 +418,6 @@ Module1780Name=Kategóriák Module1780Desc=Kategóriában vezetősége (termékek, szállítók és vevők) Module2000Name=WYSIWYG szerkesztő Module2000Desc=Hagyjuk szerkeszteni egy szöveget terület egy fejlett szerkesztő -Module2200Name=Haszonkölcsönzési jogait -Module2200Desc=Hitelezési jogkezelés -Module2300Name=Menük -Module2300Desc=Menü vezetése Module2400Name=Napirend Module2400Desc=Események / feladatok és napirend menedzsment Module2500Name=Elektronikus Content Management diff --git a/htdocs/langs/is_IS/admin.lang b/htdocs/langs/is_IS/admin.lang index 3b4af098b57..6ed5df3e4fb 100644 --- a/htdocs/langs/is_IS/admin.lang +++ b/htdocs/langs/is_IS/admin.lang @@ -369,10 +369,6 @@ Module1780Name=Flokkar Module1780Desc=Stjórn Flokkur's (vörur, birgja og viðskiptavina) Module2000Name=Fckeditor Module2000Desc=WYSIWYG Editor -Module2200Name=Útlán réttindi -Module2200Desc=Útlán réttindi -Module2300Name=Matseðlar -Module2300Desc=Valmynd's stjórnun Module2400Name=Dagskrá Module2400Desc=Aðgerðir / verkefni og dagskrá stjórnun Module2500Name=Rafræn Innihald Stjórnun diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang index a8a55093f8d..bb7757adb94 100644 --- a/htdocs/langs/it_IT/admin.lang +++ b/htdocs/langs/it_IT/admin.lang @@ -641,8 +641,6 @@ Module2200Desc =Gestione dei diritti di prestito Module2200Name =Diritti di prestito Module22Desc =Gestione posta massiva Module22Name =Posta massiva -Module2300Desc =Gestione dei Menu -Module2300Name =Menu Module23Desc =Monitoraggio del consumo energetico Module23Name =Energia Module2400Desc =Gestione eventi/compiti e ordine del giorno diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang index 6422a0c9634..f1a474fed1a 100644 --- a/htdocs/langs/ja_JP/admin.lang +++ b/htdocs/langs/ja_JP/admin.lang @@ -418,10 +418,6 @@ Module1780Name=カテゴリー Module1780Desc=Categorieの管理（製品、サプライヤー、顧客） Module2000Name=WYSIWYGエディタ Module2000Desc=高度なエディタを使用して、いくつかのテキストエリアを編集することができます -Module2200Name=融資の権限 -Module2200Desc=貸出権限の管理 -Module2300Name=メニュー -Module2300Desc=メニューの管理 Module2400Name=議題 Module2400Desc=イベント/タスクと議題の管理 Module2500Name=電子コンテンツ管理 diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang index 7a9ec630980..f37656c62ab 100644 --- a/htdocs/langs/nb_NO/admin.lang +++ b/htdocs/langs/nb_NO/admin.lang @@ -299,10 +299,6 @@ Module1400Name=Regnskapsekspert Module1400Desc=Behandling av regnskapssopplysninger for eksperter (double parties) Module1780Name=Kategorier Module1780Desc=Behandling av kategorier (varer, leverandører og kunder) -Module2200Name=Utlånsrettigheter -Module2200Desc=Behandling av utlånsrettigheter -Module2300Name=Menyer -Module2300Desc=Menybehandling Module2400Name=Agenda Module2400Desc=Handlinger/oppgaver og agendabehandling Module2500Name=Electronic Content Management diff --git a/htdocs/langs/nl_BE/admin.lang b/htdocs/langs/nl_BE/admin.lang index 9da2674c14c..711478a2a6a 100644 --- a/htdocs/langs/nl_BE/admin.lang +++ b/htdocs/langs/nl_BE/admin.lang @@ -413,10 +413,6 @@ Module1780Name = Categorieën Module1780Desc = Categorie' beheer (producten, leveranciers en klanten) Module2000Name = Module2000Desc = -Module2200Name = Uitleenrechten -Module2200Desc = Uitleenrechten beheer -Module2300Name = Menu's -Module2300Desc = Menu's beheer Module2400Name = Agenda Module2400Desc = Acties / taken en agenda beheer Module2500Name = Electronic Content Management diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang index b6645c0783c..5fe48ac0ab6 100644 --- a/htdocs/langs/nl_NL/admin.lang +++ b/htdocs/langs/nl_NL/admin.lang @@ -383,10 +383,6 @@ Module1780Name = Categorieën Module1780Desc = Categoriebeheer (producten, leveranciers en afnemers) Module2000Name = Fckeditor Module2000Desc = Een WYSIWYG editor -Module2200Name = Uitleenrechten -Module2200Desc = Uitleenrechtenbeheer -Module2300Name = Menu's -Module2300Desc = Menubeheer Module2400Name = Agenda Module2400Desc = Acties-, taken- en agendabeheer Module2500Name = Electronic Content Management diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang index 3e98c2e19c8..1817660d665 100644 --- a/htdocs/langs/pl_PL/admin.lang +++ b/htdocs/langs/pl_PL/admin.lang @@ -306,10 +306,6 @@ Module1400Name=Księgowość ekspertów Module1400Desc=Księgowość zarządzania dla ekspertów (double stron) Module1780Name=Kategorie Module1780Desc=Kategorie zarządzania (produktów, dostawców i klientów) -Module2200Name=Użyczanie -Module2200Desc=Kredyty zarządzania prawami -Module2300Name=Menu -Module2300Desc=Menu zarządzania Module2400Name=Porządek obrad Module2400Desc=Działania / zadania i porządku zarządzania Module2500Name=Electronic Content Management diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang index 78a92d28d73..d001e6fb84c 100644 --- a/htdocs/langs/pt_BR/admin.lang +++ b/htdocs/langs/pt_BR/admin.lang @@ -320,10 +320,6 @@ Module1200Name=Mantis Module1200Desc=Interface com o sistema de seguimento de incidências Mantis Module1780Name=Categorias Module1780Desc=Administração de categorias (produtos, Fornecedores e clientes) -Module2200Name=Direito de emprétimos -Module2200Desc=Administração dos direitos de emprétimos -Module2300Name=Menus -Module2300Desc=Administração dos menus por base de dados Module2400Name=Agenda Module2400Desc=Administração da agenda e das ações Module2500Name=Administração Eletrônica de Documentos diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang index c9a0c81d20e..101386ac926 100644 --- a/htdocs/langs/pt_PT/admin.lang +++ b/htdocs/langs/pt_PT/admin.lang @@ -562,8 +562,6 @@ Module2200Desc = Gestão dos direitos de empréstimos Module2200Name = Direito de empréstimos Module22Desc = Administração e envío de E-Mails massivos Module22Name = E-Mailings -Module2300Desc = Administração dos menus por base de dados -Module2300Name = Menus Module23Desc = Acompanhamento do consumo de energia Module23Name = Energia Module2400Desc = Gestão da agenda e das acções diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang index 907e7c10e7b..e049b78fbbd 100644 --- a/htdocs/langs/ro_RO/admin.lang +++ b/htdocs/langs/ro_RO/admin.lang @@ -304,10 +304,6 @@ Module1400Name=Expert contabil Module1400Desc=Contabilitate de gestiune pentru experţi (dublu părţi) Module1780Name=Categorii Module1780Desc=Categorii de "management (produse, furnizori şi clienţi) -Module2200Name=Credite drepturile -Module2200Desc=Credite de gestionare a drepturilor -Module2300Name=Meniuri -Module2300Desc=Meniuri de gestionare Module2400Name=Ordinea de zi Module2400Desc=Acţiuni / activităţi de ordine de zi şi de gestionare a Module2500Name=Electronic Content Management diff --git a/htdocs/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang index 76591925e57..9f051c0f3ba 100644 --- a/htdocs/langs/ru_RU/admin.lang +++ b/htdocs/langs/ru_RU/admin.lang @@ -303,10 +303,6 @@ Module1400Name=Бухгалтерия эксперт Module1400Desc=Бухгалтерия управления для экспертов (двойная сторон) Module1780Name=Категории Module1780Desc=Категории управления (продукции, поставщиков и заказчиков) -Module2200Name=Кредитование человека -Module2200Desc=Кредитование права управления -Module2300Name=Меню -Module2300Desc=Меню управления Module2400Name=Повестка дня Module2400Desc=Деятельность / задачи и программы управления Module2500Name=Электронное управление diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang index 47b8ab80347..6c83d1d141e 100644 --- a/htdocs/langs/sl_SI/admin.lang +++ b/htdocs/langs/sl_SI/admin.lang @@ -399,10 +399,6 @@ Module1780Name = Kategorije Module1780Desc = Upravljanje kategorij (proizvodi, dobavitelji in kupci) Module2000Name = Fck urejevalnik Module2000Desc = WYSIWYG urejevalnik -Module2200Name = Kreditne pravice -Module2200Desc = Upravljanje kreditnih pravic -Module2300Name = Meniji -Module2300Desc = Upravljanje menijev Module2400Name = Dnevni red Module2400Desc = Upravljanje aktivnosti/nalog in dnevnih redov Module2500Name = Upravljanje elektronskih vsebin diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang index 82e94b5acd9..e7036e47db4 100644 --- a/htdocs/langs/sv_SE/admin.lang +++ b/htdocs/langs/sv_SE/admin.lang @@ -372,10 +372,6 @@ Module1780Name=Kategorier Module1780Desc=Categorie ledning (produkter, leverantörer och kunder) Module2000Name=FCKeditor Module2000Desc=WYSIWYG Editor -Module2200Name=Utlåning rättigheter -Module2200Desc=Utlåning förvaltning av rättigheter -Module2300Name=Menyer -Module2300Desc=Meny ledning Module2400Name=Agenda Module2400Desc=Åtgärder / uppgifter och dagordning förvaltning Module2500Name=Electronic Content Management diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang index 05643a913fb..e0be1ed27fe 100755 --- a/htdocs/langs/tr_TR/admin.lang +++ b/htdocs/langs/tr_TR/admin.lang @@ -456,10 +456,6 @@ Module1780Name=Kategoriler Module1780Desc=Kategorilerin yönetimi (ürünler, tedarikçiler ve müşteriler) Module2000Name=WYSIWYG düzenleyici Module2000Desc=Gelişmiş editör kullanarak bazı metin alanlarının düzenlenmesini sağlar -Module2200Name=Kiralama hakları -Module2200Desc=Kiralama hakları yönetimi -Module2300Name=Menüler -Module2300Desc=Menü yönetimi Module2400Name=Gündem Module2400Desc=Etkinlikler/görevler ve gündem yönetimi Module2500Name=Elektronik İçerik Yönetimi diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang index 39121d9ce0b..937e3dae058 100644 --- a/htdocs/langs/zh_CN/admin.lang +++ b/htdocs/langs/zh_CN/admin.lang @@ -366,10 +366,6 @@ Module1780Name=分类 Module1780Desc=的类别：管理层（产品，供应商和客户） Module2000Name=fckeditor的 Module2000Desc=所见即所得的编辑器 -Module2200Name=贷款的权利 -Module2200Desc=贷款权限管理 -Module2300Name=菜单 -Module2300Desc=菜单的管理 Module2400Name=议程 Module2400Desc=行动/任务和议程管理 Module2500Name=电子内容管理 diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang index c1f69179187..edf18ba2584 100644 --- a/htdocs/langs/zh_TW/admin.lang +++ b/htdocs/langs/zh_TW/admin.lang @@ -371,10 +371,6 @@ Module1780Name=分類 Module1780Desc=分類的管理（產品，供應商和客戶） Module2000Name=fckeditor的 Module2000Desc=所見即所得的編輯器 -Module2200Name=貸款的權利 -Module2200Desc=貸款權限管理 -Module2300Name=選單 -Module2300Desc=選單的管理 Module2400Name=議程 Module2400Desc=行動/任務和議程管理 Module2500Name=電子內容管理 diff --git a/test/soapui/Dolibarr-soapui-project.xml b/test/soapui/Dolibarr-soapui-project.xml index e74f5181696..97e6062b57d 100755 --- a/test/soapui/Dolibarr-soapui-project.xml +++ b/test/soapui/Dolibarr-soapui-project.xml @@ -1,5 +1,5 @@ - -http://localhostdolibarr/dolibarrnew/webservices/server_other.php?wsdl + +http://localhostdolibarr/dolibarrnew/webservices/server_other.php?wsdl @@ -69,7 +69,7 @@ -]]>http://localhostdolibarr/dolibarrnew/webservices/server_invoice.php?wsdl +]]>http://localhost/dolibarrnew/webservices/server_invoice.php?wsdl @@ -108,13 +108,6 @@ - - - - - - - @@ -146,13 +139,6 @@ - - - - - - - @@ -236,10 +222,10 @@ - + -]]>http://schemas.xmlsoap.org/wsdl/http://localhostdolibarr/dolibarrnew/webservices/server_invoice.php<xml-fragment/>UTF-8http://localhostdolibarr/dolibarrnew/webservices/server_invoice.php +]]>http://schemas.xmlsoap.org/wsdl/http://localhostdolibarr/dolibarrnew/webservices/server_invoice.phphttp://localhost/dolibarrnew/webservices/server_invoice.php<xml-fragment/>UTF-8http://localhost/dolibarrnew/webservices/server_invoice.php @@ -298,7 +284,7 @@ -]]>UTF-8http://localhostdolibarr/dolibarrnew/webservices/server_invoice.php +]]>UTF-8http://localhost/dolibarrnew/webservices/server_invoice.php @@ -338,7 +324,184 @@ -]]><xml-fragment/>UTF-8http://localhostdolibarr/dolibarrnew/webservices/server_invoice.php +]]>UTF-8http://localhostdolibarr/dolibarrnew/webservices/server_invoice.php + + + + + + ? + ? + ? + ? + ? + + + + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + + + + + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + + + + + +]]>UTF-8http://localhostdolibarr/dolibarrnew/webservices/server_invoice.php + + + + + + ? + ? + ? + ? + ? + + + + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + + + + + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + + + + + +]]>UTF-8http://localhostdolibarr/dolibarrnew/webservices/server_invoice.php + + + + + + ? + ? + ? + ? + ? + + + + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + + + + + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + + + + + +]]><xml-fragment/>UTF-8http://localhost/dolibarrnew/webservices/server_invoice.php @@ -355,7 +518,24 @@ -]]><xml-fragment/>UTF-8http://localhostdolibarr/dolibarrnew/webservices/server_invoice.php +]]>UTF-8http://localhostdolibarr/dolibarrnew/webservices/server_invoice.php + + + + + + ? + ? + ? + ? + ? + + ? + ? + ? + + +]]><xml-fragment/>UTF-8http://localhost/dolibarrnew/webservices/server_invoice.php @@ -370,7 +550,22 @@ 4 -]]>http://localhostdolibarr/dolibarrnew/webservices/server_supplier_invoice.php?wsdl +]]>UTF-8http://localhostdolibarr/dolibarrnew/webservices/server_invoice.php + + + + + + ? + ? + ? + ? + ? + + ? + + +]]>http://localhost/dolibarrnew/webservices/server_supplier_invoice.php?wsdl @@ -510,10 +705,10 @@ - + -]]>http://schemas.xmlsoap.org/wsdl/http://localhostdolibarr/dolibarrnew/webservices/server_supplier_invoice.php<xml-fragment/>UTF-8http://localhostdolibarr/dolibarrnew/webservices/server_supplier_invoice.php +]]>http://schemas.xmlsoap.org/wsdl/http://localhostdolibarr/dolibarrnew/webservices/server_supplier_invoice.phphttp://localhost/dolibarrnew/webservices/server_supplier_invoice.php<xml-fragment/>UTF-8http://localhost/dolibarrnew/webservices/server_supplier_invoice.php @@ -530,7 +725,24 @@ -]]><xml-fragment/>UTF-8http://localhostdolibarr/dolibarrnew/webservices/server_supplier_invoice.php +]]>UTF-8http://localhostdolibarr/dolibarrnew/webservices/server_supplier_invoice.php + + + + + + ? + ? + ? + ? + ? + + ? + ? + ? + + +]]><xml-fragment/>UTF-8http://localhost/dolibarrnew/webservices/server_supplier_invoice.php @@ -545,7 +757,22 @@ all -]]>http://localhostdolibarr/dolibarrnew/webservices/server_productorservice.php?wsdl +]]>UTF-8http://localhostdolibarr/dolibarrnew/webservices/server_supplier_invoice.php + + + + + + ? + ? + ? + ? + ? + + ? + + +]]>http://localhostdolibarr/dolibarrnew/webservices/server_productorservice.php?wsdl @@ -585,12 +812,33 @@ + + + + + + + + + + + + + + + + + + + + + @@ -600,13 +848,6 @@ - - - - - - - @@ -640,6 +881,14 @@ + + + + + + + + WS to get product or service @@ -656,6 +905,11 @@ + + WS to get list of all products or services for a category + + + @@ -686,13 +940,22 @@ + + + + + + + + + -]]>http://schemas.xmlsoap.org/wsdl/http://localhost/dolibarr/htdocs/webservices/server_productorservice.php<xml-fragment/>UTF-8http://localhost/dolibarr/htdocs/webservices/server_productorservice.php +]]>http://schemas.xmlsoap.org/wsdl/http://localhost/dolibarrnew/webservices/server_productorservice.phphttp://localhostdolibarr/dolibarrnew/webservices/server_productorservice.php<xml-fragment/>UTF-8http://localhostdolibarr/dolibarrnew/webservices/server_productorservice.php @@ -733,7 +996,7 @@ -]]><xml-fragment/>UTF-8http://localhost/dolibarr/htdocs/webservices/server_productorservice.php +]]><xml-fragment/>UTF-8http://localhostdolibarr/dolibarrnew/webservices/server_productorservice.php @@ -750,7 +1013,24 @@ -]]>UTF-8http://localhost/dolibarr/htdocs/webservices/server_productorservice.php +]]><xml-fragment/>UTF-8http://localhostdolibarr/dolibarrnew/webservices/server_productorservice.php + + + + + + ? + ? + ? + ? + ? + + ? + ? + ? + + +]]>UTF-8http://localhostdolibarr/dolibarrnew/webservices/server_productorservice.php @@ -770,7 +1050,22 @@ -]]>http://localhostdolibarr/webservices/server_user.php?wsdl +]]><xml-fragment/>UTF-8http://localhost/dolibarrnew/webservices/server_productorservice.php + + + + + + dolibarrkey + ? + admin + admin + + + 5 + + +]]>http://localhostdolibarr/webservices/server_user.php?wsdl @@ -809,7 +1104,8 @@ - + + @@ -820,6 +1116,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -832,12 +1181,50 @@ + + + + + + + + + + + + + + + + + + + + + + + WS to get user + + WS to get list of groups + + + + + WS to create an external user with thirdparty and contact + + + + + WS to change password of an user + + + @@ -850,6 +1237,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -873,7 +1287,85 @@ -]]>http://localhostdolibarr/webservices/server_thirdparty.php?wsdl +]]>UTF-8http://localhostdolibarr/webservices/server_user.php + + + + + + ? + ? + ? + ? + ? + + + +]]>UTF-8http://localhostdolibarr/webservices/server_user.php + + + + + + ? + ? + ? + ? + ? + + + + ? + ? + ? + ? + ? + ? +
?
+ ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + + + +]]>UTF-8http://localhostdolibarr/webservices/server_user.php + + + + + + ? + ? + ? + ? + ? + + + + ? + ? + ? + + + +]]>http://localhostdolibarr/webservices/server_thirdparty.php?wsdl @@ -899,6 +1391,7 @@ + @@ -928,6 +1421,7 @@ + @@ -967,6 +1461,15 @@ + + + + + + + + + @@ -987,6 +1490,11 @@ + + WS to update a thirdparty + + + WS to get list of thirdparties id and ref @@ -1013,6 +1521,15 @@ + + + + + + + + + @@ -1114,7 +1631,59 @@ -]]>https://www.ovh.com/soapi/soapi-re-1.32.wsdl]]>UTF-8http://localhostdolibarr/webservices/server_thirdparty.php + + + + + + ? + ? + ? + ? + ? + + + + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? +
?
+ ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + + + +]]>https://www.ovh.com/soapi/soapi-re-1.32.wsdl? -]]> \ No newline at end of file +]]>http://localhost/dolibarrnew/webservices/server_actioncomm.php?wsdl + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + WS to get actioncommType + + + + + WS to get actioncomm + + + + + WS to create a actioncomm + + + + + WS to update a actioncomm + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +]]>http://schemas.xmlsoap.org/wsdl/http://localhost/dolibarrnew/webservices/server_actioncomm.phpUTF-8http://localhost/dolibarrnew/webservices/server_actioncomm.php + + + + + + ? + ? + ? + ? + ? + + + + ? + ? + ? + ? + ? + ? + + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + + + +]]>UTF-8http://localhost/dolibarrnew/webservices/server_actioncomm.php + + + + + + ? + ? + ? + ? + ? + + ? + + +]]>UTF-8http://localhost/dolibarrnew/webservices/server_actioncomm.php + + + + + + ? + ? + ? + ? + ? + + + +]]>UTF-8http://localhost/dolibarrnew/webservices/server_actioncomm.php + + + + + + ? + ? + ? + ? + ? + + + + ? + ? + ? + ? + ? + ? + + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + + + +]]> \ No newline at end of file