diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 83585efc51db040b9e472a2c8be0bdddabd9d777..5cd0857f92313d3d91d8b9218f2d9d54bb139753 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -361,8 +361,8 @@ class Facture extends CommonInvoice '', 0, $fk_parent_line, - $this->lines[$i]->fk_fournprice, - $this->lines[$i]->pa_ht + $this->lines[$i]->fk_fournprice, + $this->lines[$i]->pa_ht ); if ($result < 0) { @@ -1564,7 +1564,7 @@ class Facture extends CommonInvoice $now=dol_now(); $error=0; - dol_syslog(get_class($this).'::validate force_number='.$force_number.', idwarehouse='.$idwarehouse, LOG_WARNING); + dol_syslog(get_class($this).'::validate user='.$user->id.', force_number='.$force_number.', idwarehouse='.$idwarehouse, LOG_WARNING); // Check parameters if (! $this->brouillon) @@ -1865,9 +1865,11 @@ class Facture extends CommonInvoice * @param string $origin 'order', ... * @param int $origin_id Id of origin object * @param int $fk_parent_line Id of parent line + * @param int $fk_fournprice To calculate margin + * @param int $pa_ht Buying price of line * @return int <0 if KO, Id of line if OK */ - function addline($facid, $desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits=0, $fk_remise_except='', $price_base_type='HT', $pu_ttc=0, $type=0, $rang=-1, $special_code=0, $origin='', $origin_id=0, $fk_parent_line=0, $fk_fournprice=null, $pa_ht = 0) + function addline($facid, $desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits=0, $fk_remise_except='', $price_base_type='HT', $pu_ttc=0, $type=0, $rang=-1, $special_code=0, $origin='', $origin_id=0, $fk_parent_line=0, $fk_fournprice=null, $pa_ht=0) { dol_syslog(get_class($this)."::Addline facid=$facid,desc=$desc,pu_ht=$pu_ht,qty=$qty,txtva=$txtva, txlocaltax1=$txlocaltax1, txlocaltax2=$txlocaltax2, fk_product=$fk_product,remise_percent=$remise_percent,date_start=$date_start,date_end=$date_end,ventil=$ventil,info_bits=$info_bits,fk_remise_except=$fk_remise_except,price_base_type=$price_base_type,pu_ttc=$pu_ttc,type=$type", LOG_DEBUG); include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); @@ -1974,9 +1976,9 @@ class Facture extends CommonInvoice $this->line->origin=$origin; $this->line->origin_id=$origin_id; - // infos marge - $this->line->fk_fournprice = $fk_fournprice; - $this->line->pa_ht = $pa_ht; + // infos marge + $this->line->fk_fournprice = $fk_fournprice; + $this->line->pa_ht = $pa_ht; // TODO Ne plus utiliser //$this->line->price=($this->type==2?-1:1)*abs($price); @@ -2031,9 +2033,11 @@ class Facture extends CommonInvoice * @param int $type Type of line (0=product, 1=service) * @param int $fk_parent_line ??? * @param int $skip_update_total ??? + * @param int $fk_fournprice To calculate margin + * @param int $pa_ht Buying price of line * @return int < 0 if KO, > 0 if OK */ - function updateline($rowid, $desc, $pu, $qty, $remise_percent=0, $date_start, $date_end, $txtva, $txlocaltax1=0, $txlocaltax2=0,$price_base_type='HT', $info_bits=0, $type=0, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=null, $pa_ht = 0) + function updateline($rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $txtva, $txlocaltax1=0, $txlocaltax2=0, $price_base_type='HT', $info_bits=0, $type=0, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=null, $pa_ht=0) { include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); @@ -2116,9 +2120,9 @@ class Facture extends CommonInvoice $this->line->fk_parent_line = $fk_parent_line; $this->line->skip_update_total = $skip_update_total; - // infos marge - $this->line->fk_fournprice = $fk_fournprice; - $this->line->pa_ht = $pa_ht; + // infos marge + $this->line->fk_fournprice = $fk_fournprice; + $this->line->pa_ht = $pa_ht; // A ne plus utiliser //$this->line->price=$price; diff --git a/htdocs/core/lib/ws.lib.php b/htdocs/core/lib/ws.lib.php index babe8609f6bbdc0d0dc9c99477d00dce1a6fedb4..9e1d0fd129235f10309baccebafb2c33a24e6be6 100755 --- a/htdocs/core/lib/ws.lib.php +++ b/htdocs/core/lib/ws.lib.php @@ -30,7 +30,7 @@ * @param int &$error Number of errors * @param string &$errorcode Error string code * @param string &$errorlabel Error string label - * @return User Return user object identified by login/pass/entity into authentication array + * @return User Return user object identified by login/pass/entity into authentication array */ function check_authentication($authentication,&$error,&$errorcode,&$errorlabel) { @@ -70,10 +70,12 @@ function check_authentication($authentication,&$error,&$errorcode,&$errorlabel) $error++; $errorcode='ERROR_USER_DISABLED'; $errorlabel='This user has been locked or disabled'; } - + // Validation of login if (! $error) { + $fuser->getrights(); // Load permission of user + // Authentication mode if (empty($dolibarr_main_authentication)) $dolibarr_main_authentication='http,dolibarr'; // Authentication mode: forceuser diff --git a/htdocs/langs/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang index 2ddb0d159f98d54c7a59515733c831b475a951e7..20151ff6e77b78d59239bbf72fab0ddbb35a34ae 100644 --- a/htdocs/langs/ar_SA/admin.lang +++ b/htdocs/langs/ar_SA/admin.lang @@ -156,7 +156,6 @@ AutoDetectLang=اكتشاف (اللغة المتصفح) FeatureDisabledInDemo=سمة المعوقين في عرض Rights=أذونات BoxesDesc=صناديق منطقة الشاشة التي تظهر قطعة من المعلومات عن بعض الصفحات. يمكنك الاختيار بين عرض المربع أو عن طريق اختيار ليست هدفا في الصفحة والنقر على 'تفعيل' ، أو عن طريق النقر فوق مزبلة لتعطيله. -OnlyActiveElementsAreShown=Only elements from <a href=إلا عناصر من <a href="modules.php">وحدات مكن</a> ترد. ModulesDesc=Dolibarr تحديد الوحدات التي تم تمكين وظيفة في مجال البرمجيات. وتتطلب بعض وحدات الأذونات ، يجب ان تمنح للمستخدمين ، وبعد أن تمكن وحدة. ModulesInterfaceDesc=فإن التفاعل بين وحدات Dolibarr يسمح لك بإضافة السمات الخارجية تعتمد على البرمجيات والنظم والخدمات. ModulesSpecialDesc=وحدات خاصة أو محددة جدا ونادرا ما تستخدم وحدات. diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang index 536ae7fce938eb989b3dc6ce9f38aa4ebfbea82c..c60c913d759445bb7a9eedbb2ecf5e382194024f 100644 --- a/htdocs/langs/ca_ES/admin.lang +++ b/htdocs/langs/ca_ES/admin.lang @@ -179,7 +179,7 @@ AutoDetectLang=Autodetecció (navegador) FeatureDisabledInDemo=Opció deshabilitada en demo Rights=Permisos BoxesDesc=Els panells són petites zones d'informació que hi ha en algunes pàgines. Pot triar activar o desactivar un panell fent clic a 'Activar', o fent click al cubell d'escombraries per desactivar. Només es mostren els panells relacionades amb un <a href="modules.php"> mòdul </a> actiu. -OnlyActiveElementsAreShown=Només els elements de <a href="modules.php"> mòduls activats</a> són mostrats +OnlyActiveElementsAreShown=Només els elements de <a href="%s"> mòduls activats</a> són mostrats ModulesDesc=Els mòduls Dolibarr defineixen les funcionalitats disponibles en l'aplicació. Alguns mòduls requereixen drets que hauran d'indicar als usuaris perquè puguin accedir a les seves funcionalitats. ModulesInterfaceDesc=Els mòduls de interface són mòduls que permeten vincular Dolibarr amb sistemes, aplicacions o serveis externs. ModulesSpecialDesc=Els mòduls complementaris són mòduls d'ús molt específic o menys corrent que els mòduls normals. diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang index 2c0ce497ba1734a2a2a105253300ec5bb05a1b6e..3e1c3382f497db07b9cecdc0771e9ac7342b7079 100644 --- a/htdocs/langs/da_DK/admin.lang +++ b/htdocs/langs/da_DK/admin.lang @@ -151,7 +151,6 @@ AutoDetectLang=Autodetect (browsersprog) FeatureDisabledInDemo=Funktionen slået fra i demo Rights=Tilladelser BoxesDesc=Kasserne er skærmen, der viser et stykke af oplysninger om nogle sider. Du kan vælge mellem at få vist feltet eller ikke ved at vælge målet side og klikke på 'Aktiver', eller ved at klikke på skraldespanden for at deaktivere den. -OnlyActiveElementsAreShown=Only elements from <a href=Kun elementer fra <a href="modules.php">aktiveret moduler</a> vises. ModulesDesc=Dolibarr moduler definere, hvilke funktioner er aktiveret i softwaren. Nogle moduler kræver tilladelser skal du give brugere, efter at have aktiveret modul. ModulesInterfaceDesc=Den Dolibarr moduler interface giver dig mulighed for at tilføje funktioner, afhængigt af eksterne software, systemer eller tjenesteydelser. ModulesSpecialDesc=Special moduler er meget specifikke eller sjældent anvendte moduler. diff --git a/htdocs/langs/de_AT/admin.lang b/htdocs/langs/de_AT/admin.lang index df768f63d31ab2c029d82472f2abb4fbfd51e6cc..40f4c24a44874eb623dc4a72a6573b3bf8494e6d 100644 --- a/htdocs/langs/de_AT/admin.lang +++ b/htdocs/langs/de_AT/admin.lang @@ -146,7 +146,7 @@ AutoDetectLang=Automatische Erkennung (Browser-Sprache) FeatureDisabledInDemo=Funktion in der Demoversion deaktiviert Rights=Berechtigungen BoxesDesc=Boxen sind auf einigen Seiten angezeigte Informationsbereiche. Sie können die Anzeige einer Box einstellen, indem Sie auf die Zielseite klicken und 'Aktivieren' wählen. Zum Ausblenden einer Box klicken Sie einfach auf den Papierkorb. -OnlyActiveElementsAreShown=Nur Elemente aus <a href="modules.php">aktiven Module</a> werden angezeigt. +OnlyActiveElementsAreShown=Nur Elemente aus <a href="%s">aktiven Module</a> werden angezeigt. ModulesDesc=Hier können Sie die verfügbaren Module und Funktionen auswählen. Einige Module benötigen nach ihrer Aktivierung das Setzen spezifischer Benutzerberechtigungen. ModulesInterfaceDesc=Die Schnittstellenmodule erlauben Ihnen das Einbinden weiterer Funktionen auf Basis externer Software, Systeme oder Services ModulesSpecialDesc=Spezialmodule sind für sehr spezifische Anwendungsfälle gedacht und oft nicht verwendet diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang index 0b54c120dfe2f14f333cd98264460451895d9187..459a656bf0f886218d2eab427b6786e5c924e4b1 100644 --- a/htdocs/langs/de_DE/admin.lang +++ b/htdocs/langs/de_DE/admin.lang @@ -185,7 +185,7 @@ AutoDetectLang=Automatische Erkennung (Browser-Sprache) FeatureDisabledInDemo=Funktion in der Demoversion deaktiviert Rights=Berechtigungen BoxesDesc=Boxen sind auf einigen Seiten angezeigte Informationsbereiche. Sie können die Anzeige einer Box einstellen, indem Sie auf die Zielseite klicken und 'Aktivieren' wählen. Zum Ausblenden einer Box klicken Sie einfach auf den Papierkorb. -OnlyActiveElementsAreShown=Nur Elemente aus <a href="modules.php">aktiven Module</a> werden angezeigt. +OnlyActiveElementsAreShown=Nur Elemente aus <a href="%s">aktiven Module</a> werden angezeigt. ModulesDesc=Hier können Sie die verfügbaren Module und Funktionen auswählen. Einige Module benötigen nach ihrer Aktivierung das Setzen spezifischer Benutzerberechtigungen. ModulesInterfaceDesc=Die Schnittstellenmodule erlauben Ihnen das Einbinden weiterer Funktionen auf Basis externer Software, Systeme oder Services ModulesSpecialDesc=Spezialmodule sind für sehr spezifische Anwendungsfälle gedacht und oft nicht verwendet diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 00893ba7a851f97711a1bbe402522915143c8c69..530216d2bae23799932ef320aca016954c81ed05 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -178,7 +178,7 @@ AutoDetectLang=Autodetect (browser language) FeatureDisabledInDemo=Feature disabled in demo Rights=Permissions BoxesDesc=Boxes are screen area that show a piece of information on some pages. You can choose between showing the box or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it. -OnlyActiveElementsAreShown=Only elements from <a href="modules.php">enabled modules</a> are shown. +OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown. ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off in column "Status" to enable a module/feature. ModulesInterfaceDesc=The Dolibarr modules interface allows you to add features depending on external software, systems or services. ModulesSpecialDesc=Special modules are very specific or seldom used modules. diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang index 1277191bfb38a9885ad9b12de80d77cedce1368c..5198a9151de535237b74bf370be660d2839098c9 100644 --- a/htdocs/langs/es_ES/admin.lang +++ b/htdocs/langs/es_ES/admin.lang @@ -179,7 +179,7 @@ AutoDetectLang=Autodetección (navegador) FeatureDisabledInDemo=Opción deshabilitada en demo Rights=Permisos BoxesDesc=Los paneles son pequeñas zonas de información que se muestran en algunas páginas. Puede elegir activar o desactivar un panel haciendo clic en 'Activar', o haciendo click en el cubo de basura para desactivarlo. Solo se muestran los paneles relacionados con un <a href="modules.php">módulo</a> activo. -OnlyActiveElementsAreShown=Sólo los elementos de <a href="modules.php">módulos activados</a> son mostrados +OnlyActiveElementsAreShown=Sólo los elementos de <a href="%s">módulos activados</a> son mostrados ModulesDesc=Los módulos Dolibarr definen las funcionalidades disponibles en la aplicación. Algunos módulos requieren derechos que deberán indicarse a los usuarios para que puedan acceder a sus funcionalidades. ModulesInterfaceDesc=Los módulos de interfaz son módulos que permiten vincular a Dolibarr con sistemas, aplicaciones o servicios externos. ModulesSpecialDesc=Los módulos complementarios son módulos de uso muy específico o menos corriente que los módulos normales. diff --git a/htdocs/langs/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang index 5e0612f63aef8adae0d08d7714f56f5c3e0523c8..c99756a46db682f1240101076d64f01f2572cda2 100644 --- a/htdocs/langs/et_EE/admin.lang +++ b/htdocs/langs/et_EE/admin.lang @@ -185,7 +185,7 @@ AutoDetectLang=Autodetect (brauser keeles) FeatureDisabledInDemo=Feature blokeeritud demo Rights=Permissions BoxesDesc=Kastid on ekraani ala, mis näitavad osa teabest mõned leheküljed. Valida saab näidata kasti või mitte, valides sihtlehekülge ja klõpsake "Activate" või klõpsates prügikasti blokeerida. -OnlyActiveElementsAreShown=Vaid elemente <a href="modules.php">toega mooduleid</a> näidatakse. +OnlyActiveElementsAreShown=Vaid elemente <a href="%s">toega mooduleid</a> näidatakse. ModulesDesc=Dolibarr moodulid määratlevad mille funktsioon on lubatud tarkvara. Mõned moodulid nõuavad õigusi tuleb anda kasutajatele, pärast võimaldab moodul. Klõpsake nuppu sees / väljas veerus "Staatus", mis võimaldab moodul / funktsiooni. ModulesInterfaceDesc=Dolibarr moodulite liides lubab teil lisada funktsioone sõltuvalt välis-tarkvara, süsteemide või teenuste. ModulesSpecialDesc=Spetsiaalseid mooduleid on väga spetsiifilised või harva kasutatavate moodulitega. diff --git a/htdocs/langs/fa_IR/admin.lang b/htdocs/langs/fa_IR/admin.lang index f45f86538e9a5a300a9fd853a715d135413fe900..a41c42b4251d2f782040e85ca70e2aa05d017d08 100644 --- a/htdocs/langs/fa_IR/admin.lang +++ b/htdocs/langs/fa_IR/admin.lang @@ -166,10 +166,6 @@ No=خیر AutoDetectLang= شناسایی خودکار زبان FeatureDisabledInDemo= امکانات در دمو غیر فعال است Rights= مجوزها -BoxesDesc= -OnlyActiveElementsAreShown= -ModulesDesc= -ModulesInterfaceDesc= ModulesSpecialDesc=وحدات خاصة أو محددة جدا ونادرا ما تستخدم وحدات. ModulesJobDesc=توفير وحدات تجارية بسيطة ومحددة سلفا من Dolibarr الإعداد لأعمال معين. BoxesAvailable=صناديق متاحة diff --git a/htdocs/langs/fi_FI/admin.lang b/htdocs/langs/fi_FI/admin.lang index 706a0b5a3b1f53c1ec7a5335f3ee393eb001cf23..0ea5ba214ad45e6aa8157c29365ce52d24cb0a78 100644 --- a/htdocs/langs/fi_FI/admin.lang +++ b/htdocs/langs/fi_FI/admin.lang @@ -149,7 +149,6 @@ AutoDetectLang=Automaattisesti (selaimen kieli) FeatureDisabledInDemo=Feature vammaisten demo Rights=Oikeudet BoxesDesc=Laatikot ovat kuvaruudun alueella, jotka osoittavat, pala tietoa joitakin sivuja. Voit valita, näytetäänkö ruutuun tai ei valitsemalla kohde sivun ja napsauttamalla "Ota käyttöön", tai klikkaamalla roskakoriin poistaa se. -OnlyActiveElementsAreShown=Only elements from <a href=Vain osia <a href="modules.php">ansiosta moduulit</a> ovat osoittaneet. ModulesDesc=Dolibarr modules määritellä, mitkä toiminnot on käytössä ohjelmistoja. Jotkut moduulit vaatia oikeuksia sinulla on myönnettävä käyttäjille jälkeen mahdollistaa moduulin. ModulesInterfaceDesc=The Dolibarr moduulien ansiosta voit lisätä ominaisuuksia riippuen ohjelmistojen, järjestelmien tai palveluja. ModulesSpecialDesc=Erityispainos moduulit ovat hyvin erityinen tai harvoin käytetty moduuleita. diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index b4d8169d1676f7f48af6a99978303144dd8379fc..112c0c8cfcac004fc754cb75a332c6d0fb9711a0 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -179,7 +179,7 @@ AutoDetectLang= Détection auto (navigateur) FeatureDisabledInDemo= Fonction désactivée dans la démo Rights= Permissions BoxesDesc= Les boîtes sont des zones d'information réduites qui s'affichent sur certaines pages. Vous pouvez choisir ou non d'activer une boîte en sélectionnant la page cible et en cliquant sur 'Activer', ou en cliquant sur la poubelle pour la désactiver. -OnlyActiveElementsAreShown= Seuls les éléments en rapport avec un <a href="modules.php">module actif</a> sont présentés. +OnlyActiveElementsAreShown= Seuls les éléments en rapport avec un <a href="%s">module actif</a> sont présentés. ModulesDesc= Les modules Dolibarr définissent les fonctionnalités disponibles dans l'application. Certains modules nécessitent des droits qu'il vous faudra affecter aux utilisateurs pour qu'ils puissent accéder à leurs fonctionnalités. Cliquez sur le bouton on/off de la colonne "Etat" pour activer un module/fonctionnalité. ModulesInterfaceDesc= Les modules d'interfaces sont des modules qui permettent de lier Dolibarr à des systèmes, applications ou services externes. ModulesSpecialDesc= Les modules complémentaires sont des modules à usage très spécifique ou moins courant que les modules standards. diff --git a/htdocs/langs/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang index 08f8f1482a186f69cd5e3e04ada217ef1add5cf2..2d6a102e255077aa990013d0d7b406de83ca7e54 100644 --- a/htdocs/langs/he_IL/admin.lang +++ b/htdocs/langs/he_IL/admin.lang @@ -185,7 +185,7 @@ AutoDetectLang=Autodetect (שפת הדפדפן) FeatureDisabledInDemo=התכונה זמינה ב דמו Rights=הרשאות BoxesDesc=תיבות שטח המסך להראות כי פיסת מידע על כמה דפים. ניתן לבחור בין הצגת תיבת או לא על ידי בחירת דף היעד ולחיצה על "הפעל", או על ידי לחיצה על פח אשפה כדי לבטל את זה. -OnlyActiveElementsAreShown=האלמנטים היחידים של <a href="modules.php">מודולים המאפשרים</a> מוצגים. +OnlyActiveElementsAreShown=האלמנטים היחידים של <a href="%s">מודולים המאפשרים</a> מוצגים. ModulesDesc=מודולים Dolibarr להגדיר אילו פונקציונליות מופעלת התוכנה. מודולים מסוימים מחייבים הרשאות עליך להעניק למשתמשים, לאחר הפעלת המודול. לחץ על כפתור כיבוי / ב 'סטטוס' טור לאפשר מודול / תכונה. ModulesInterfaceDesc=ממשק מודולים Dolibarr מאפשר להוסיף תכונות בהתאם לתוכנה, מערכות חיצוניות או שירותים. ModulesSpecialDesc=מודולים מיוחדים הם מודולים ספציפיים מאוד, או השתמשו רק לעתים רחוקות. diff --git a/htdocs/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang index c1912ac8f5b63a07c556a8ca2fb67167b15b27b1..b221bfd3bddca3de8aeebebd05995646c776f0f3 100644 --- a/htdocs/langs/hu_HU/admin.lang +++ b/htdocs/langs/hu_HU/admin.lang @@ -185,7 +185,7 @@ AutoDetectLang=Autodetect (böngésző nyelv) FeatureDisabledInDemo=Tiltva demo Rights=Engedélyek BoxesDesc=Dobozok képernyő terület mutatják, hogy az információ egy elemének egyes oldalakon. Választhat a bemutató dobozban, vagy nem célzott kiválasztásával oldalra és kattintson a "Aktiválás", vagy kattintson a kukába kikapcsolni. -OnlyActiveElementsAreShown=Csak az elemek <a href="modules.php">bekapcsolt modulok</a> jelennek meg. +OnlyActiveElementsAreShown=Csak az elemek <a href="%s">bekapcsolt modulok</a> jelennek meg. ModulesDesc=Dolibarr modulok meghatározzák, mely funkció engedélyezve van a szoftverben. Néhány modul szükséges engedélyeket be kell nyújtani a felhasználók számára, lehetővé téve modul után. Kattints a gombra on / off oszlopban "Állapot", hogy egy modul / funkciót. ModulesInterfaceDesc=A Dolibarr modulok interfész lehetővé teszi, hogy új funkciókat függően külső szoftverek, rendszerek és szolgáltatások. ModulesSpecialDesc=Speciális modulok nagyon egyedi vagy ritkán használt modulokat. diff --git a/htdocs/langs/is_IS/admin.lang b/htdocs/langs/is_IS/admin.lang index 7cbd32b36c8512c149a583bad1af4c3432164d70..a0b1acbfc7e3b7cee5482bfa429882a328870f60 100644 --- a/htdocs/langs/is_IS/admin.lang +++ b/htdocs/langs/is_IS/admin.lang @@ -173,7 +173,7 @@ AutoDetectLang=Finna sjálfkrafa (vafrara tungumál) FeatureDisabledInDemo=Lögun fatlaður í kynningu Rights=Heimildir BoxesDesc=Hnefaleikar eru skjár svæði sem sýna brot af upplýsingum á sumum síðum. Þú getur valið á milli sýnir kassann eða ekki með því að velja að miða síðu og smella á 'Virkja', eða með því að smella á dustbin að gera það. -OnlyActiveElementsAreShown=Aðeins atriði frá <a href="modules.php">virkt einingar</a> eru birtar. +OnlyActiveElementsAreShown=Aðeins atriði frá <a href="%s">virkt einingar</a> eru birtar. ModulesDesc=Dolibarr mát tilgreina hvaða virkni er virkt í hugbúnaði. Sum mát þurfa leyfi þér að veita notendum eftir kleift mát. ModulesInterfaceDesc=The Dolibarr mát tengi gerir þér kleift að bæta við aðgerðir fer eftir utanaðkomandi hugbúnaði, kerfi eða þjónustu. ModulesSpecialDesc=Sérstakar einingar eru mjög sérstakur eða sjaldan notað mát. diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang index 877d87ac57141ee3626da3252e014e18230aa4d2..57593e7cfe733a0e6b31182b4dbd8cdabcac73e7 100644 --- a/htdocs/langs/it_IT/admin.lang +++ b/htdocs/langs/it_IT/admin.lang @@ -806,7 +806,7 @@ Offset =Scostamento OnceSetupFinishedCreateUsers =Attenzione, sei un utente amministratore Dolibarr. Le utenze amministrative vanno utilizzate per l'impostazione del sistema. Per un uso abituale di Dolibarr si raccomanda di non utilizzare un utente amministratore, ma crearne uno nuovo dal menu utenti e gruppi. OnDelivery =Alla consegna OnInvoice =Alla fatturazione -OnlyActiveElementsAreShown =Vengono mostrati solo gli elementi relativi ai <a href="modules.php">moduli attivi</a> . +OnlyActiveElementsAreShown =Vengono mostrati solo gli elementi relativi ai <a href="%s">moduli attivi</a> . OnPayment =Al pagamento OptionVatDebitOptionDesc =L'IVA è dovuta:<br/> - alla consegna/pagamento per i beni<br/>- alla fatturazione (a debito) per i servizi OptionVATDebitOption =Opzioni per i servizi a debito diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang index edbe7ad013451724429fa03ffcaffe2f47f52db7..9a2c2f323f65ffe4a7407b55a51d00810c75a26f 100644 --- a/htdocs/langs/ja_JP/admin.lang +++ b/htdocs/langs/ja_JP/admin.lang @@ -185,7 +185,7 @@ AutoDetectLang=自動検出(ブラウザの言語) FeatureDisabledInDemo=デモで機能を無効にする Rights=パーミッション BoxesDesc=ボックスには、いくつかのページの情報の一部を示す画面領域です。あなたは、ボックスを示すかどうか、ターゲット·ページを選択し、 "アクティベート"をクリックするか、それを無効にするには、ごみ箱をクリックして選ぶことができます。 -OnlyActiveElementsAreShown=から要素のみ<a href="modules.php">対応のモジュールが</a>表示されます。 +OnlyActiveElementsAreShown=から要素のみ<a href="%s">対応のモジュールが</a>表示されます。 ModulesDesc=Dolibarrモジュールはソフトウェアで有効になっている機能を定義します。いくつかのモジュールは、モジュールを有効にした後、ユーザーに付与する必要がありますアクセス許可が必要です。モジュール/機能を有効にするには、列 "ステータス"のオン/オフボタンをクリックします。 ModulesInterfaceDesc=Dolibarrモジュールインターフェイスでは、外部のソフトウェア、システムやサービスに応じて機能を追加することができます。 ModulesSpecialDesc=特別なモジュールは、非常に特異的またはめったに使用しないモジュールです。 diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang index a97b76351269319f691f76eb1bf373026868e830..8628ee9ed27b19aacaf1f26a5c11169f6c23113b 100644 --- a/htdocs/langs/nb_NO/admin.lang +++ b/htdocs/langs/nb_NO/admin.lang @@ -142,7 +142,7 @@ AutoDetectLang=Automatisk (nettleserspråk) FeatureDisabledInDemo=Funksjonen er slått av i demo Rights=Tillatelser BoxesDesc=Bokser er områder på skjermen som viser informasjon på ønskede sider. Du kan velge om boksen skal vises eller ikke ved å velge målside og klikke på 'Aktiver', eller ved å klikke på papirkurven for å slå den av. -OnlyActiveElementsAreShown=Bare elementer fra <a href="modules.php">aktiverte moduler</a> vises. +OnlyActiveElementsAreShown=Bare elementer fra <a href="%s">aktiverte moduler</a> vises. ModulesDesc=Dolibarrmodulene styrer hvilken funksjonalitet som er aktivert i programmet. Noen moduler krever at du tildeler brukerne tilgangsrettigheter etter at du har slått på modulen. ModulesInterfaceDesc=Modulgrensesnittet i Dolibarr lar deg legge til funksjoner som bruker eksterne programmer, systemer eller tjenester. ModulesSpecialDesc=Spesialmoduler er svært spesifikke moduler, eller moduler som sjelden blir sjelden brukt. diff --git a/htdocs/langs/nl_BE/admin.lang b/htdocs/langs/nl_BE/admin.lang index ae9d5718a563cb6fd23dc52a2ca850f0ea87ac9a..c3733ea5255e636b6c5d605d61eb6d42396b850e 100644 --- a/htdocs/langs/nl_BE/admin.lang +++ b/htdocs/langs/nl_BE/admin.lang @@ -163,7 +163,7 @@ No=Nee AutoDetectLang=Autodetect (browser taal) FeatureDisabledInDemo=Functie uitgeschakeld in de demo BoxesDesc=Boxes zijn kleine vakken met informatie die op bepaalde pagina's kunnen worden weergegeven. U kunt kiezen om deze te activeren of uit te schakelen. -OnlyActiveElementsAreShown=Alleen objecten die verband houden met een <a href="modules.php"> module actief </ a> worden gepresenteerd. +OnlyActiveElementsAreShown=Alleen objecten die verband houden met een <a href="%s"> module actief </ a> worden gepresenteerd. ModulesInterfaceDesc=De interface modules van Dolibarr laat u toe functies toe te voegen afhankelijk van externe software, systemen of diensten. ModulesSpecialDesc=Speciale modules zijn zeer specifiek of zelden gebruikte modules. ModulesJobDesc=Business modules bieden een eenvoudig voorgedefinieerde setup van Dolibarr voor een bepaald bedrijf. diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang index 24b203e256ee54386127b82d60372baaf89ffd92..7f698b75b73b245e72c413fdb99f9da6f19292a6 100644 --- a/htdocs/langs/nl_NL/admin.lang +++ b/htdocs/langs/nl_NL/admin.lang @@ -171,7 +171,7 @@ AutoDetectLang = Automatisch detecteren (taal van de browser) FeatureDisabledInDemo = Functionaliteit uitgeschakeld in de demonstratie Rights = Rechten BoxesDesc = Vakken zijn delen op het scherm die bepaalde informatie tonen op geselecteerde pagina's. U kunt vak in- of uitschakelen door de doelpagina te selecteren en op "activeren" te klikken of door op de prullenbak te klikken om het vak uit te schakelen. -OnlyActiveElementsAreShown = Alleen elementen van ingeschakelde <a href="modules.php">modules</a> worden getoond. +OnlyActiveElementsAreShown = Alleen elementen van ingeschakelde <a href="%s">modules</a> worden getoond. ModulesDesc = Dolibarr modules bepalen welke functionaliteit is ingeschakeld in de software. Voor enkele modules is het noodzakelijk, zodra de module is ingeschakeld, rechten te verlenen aan de gebruikers. Klik op de knop uit / aan in de kolom "Status" om een module / functionaliteit in of uit te schakelen. ModulesInterfaceDesc = De Dolibarr 'interface'-modules staan het u toe functionaliteit toe te voegen die afhankelijk is van externe software, systemen of diensten. ModulesSpecialDesc = Speciale modules zijn zeer specifieke of zelden gebruikte modules. diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang index a00f01b6a82e0fb02e0e973892e98e1a747f703d..5865aeb71f4337934127a826fc3ecfa1105c30d9 100644 --- a/htdocs/langs/pl_PL/admin.lang +++ b/htdocs/langs/pl_PL/admin.lang @@ -151,7 +151,7 @@ AutoDetectLang=Autodetect (język przeglądarki) FeatureDisabledInDemo=Funkcja niedostępna w demo Rights=Uprawnienia BoxesDesc=Boksy są obszarze ekranu pokazują, że informacja na niektórych stronach. Możesz wybierać między pokazano pole lub nie, wybierając cel stronie i klikając przycisk "Włącz", lub klikając pojemnik na śmieci, aby ją wyłączyć. -OnlyActiveElementsAreShown=Only elements from <a href=Tylko elementy <a href="modules.php">aktywne moduły</a> są widoczne. +OnlyActiveElementsAreShown=Only elements from <a href=Tylko elementy <a href="%s">aktywne moduły</a> są widoczne. ModulesDesc=Dolibarr modules określić funkcje, które jest włączone w oprogramowaniu. Niektóre moduły wymagają uprawnień należy przyznać użytkownikom, po włączeniu modułu. ModulesInterfaceDesc=W Dolibarr modules interfejs umożliwia dodawanie funkcji w zależności od zewnętrznego oprogramowania, systemów lub usług. ModulesSpecialDesc=Specjalne moduły są bardzo specyficzne i rzadko używane moduły. diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang index d407c906d25767f19d246c744ac0d3c5d684cbcc..f8cfbfa245c2458626423b5042ac0e264ffb3560 100644 --- a/htdocs/langs/pt_BR/admin.lang +++ b/htdocs/langs/pt_BR/admin.lang @@ -144,7 +144,6 @@ AutoDetectLang=Autodetecção (navegador) FeatureDisabledInDemo=Opção desabilitada em demo Rights=Permissões BoxesDesc=As caixas são zonas de informação reduzidas que se mostram em algumas páginas. Pode escolher ativar ou desativar uma caixa fazendo click em 'Ativar', ou fazendo click não ícone de reciclagem para desativar. Só se mostram as Caixas relacionadas com um <a href -OnlyActiveElementsAreShown=Só os elementos de <a href ModulesDesc=Os módulos do ERP definem as Funcionalidades disponíveis na aplicação. Alguns módulos requerem direitos que deverão indicar-se nos Usuários para que possam acessar ás suas Funcionalidades. ModulesInterfaceDesc=Os módulos de interface são módulos que permitem vincular o ERP com sistemas, aplicações ou serviços externos. ModulesSpecialDesc=Os módulos especiais são módulos de uso específico ou menos corrente que os módulos normais. diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang index 78de5c0c03911df848ccad0f9b3bbc4d68c1502b..c072a3c62aa73a36e4ae3449ad4896919d7ae415 100644 --- a/htdocs/langs/pt_PT/admin.lang +++ b/htdocs/langs/pt_PT/admin.lang @@ -141,7 +141,7 @@ AutoDetectLang=Autodetecção (navegador) FeatureDisabledInDemo=Opção deshabilitada em demo Rights=Permissões BoxesDesc=As caixas são zonas de informação reduzidas que se mostram em algumas páginas. Pode escolher activar ou desactivar uma caixa fazendo click em 'Activar', ou fazendo click não icone de reciclagem para desactivar. Só se mostam as Caixas relacionadas com um <a href="modules.php">módulo</a> activo. -OnlyActiveElementsAreShown=Só os elementos de <a href="modules.php">módulos activados</a> som mostrados +OnlyActiveElementsAreShown=Só os elementos de <a href="%s">módulos activados</a> som mostrados ModulesDesc=Os módulos do ERP definem as Funcionalidadees disponiveis na aplicação. Alguns módulos requerem direitos que deverão indicar-se nos utilizadores para que possam aceder ás suas Funcionalidadees. ModulesInterfaceDesc=Os módulos de interface são módulos que permitem vincular o ERP com sistemas, aplicações ou serviços externos. ModulesSpecialDesc=Os módulos especiais são módulos de uso específico ou menos corrente que os módulos normais. diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang index da072e4fa3c5a4b5f9f6f900390bd198a4ad34d3..3b1720a287059d8b5da3a24c2b93f6b6bc2c7af0 100644 --- a/htdocs/langs/ro_RO/admin.lang +++ b/htdocs/langs/ro_RO/admin.lang @@ -149,7 +149,6 @@ AutoDetectLang=Autodetect (browser limbă) FeatureDisabledInDemo=Caracteristicã handicap în demo Rights=Permisiuni BoxesDesc=Cutii sunt ecran domeniu arată că o bucată de informaţii cu privire la unele pagini. Aveţi posibilitatea să alegeţi între afişarea pe cutie sau nu, prin selectarea ţintă pagină şi faceţi clic pe "Activaţi", sau făcând clic pe un coş de gunoi barat pentru al dezactiva. -OnlyActiveElementsAreShown=Only elements from <a href=Numai de la elemente <a href="modules.php">activat modulele</a> sunt afişate. ModulesDesc=Dolibarr modulele care definesc funcţia este activată în software-ul. Unele module necesită permisiuni, trebuie să acorde pentru utilizatori, după care să permită modul. ModulesInterfaceDesc=De Dolibarr module de interfaţă vă permite să adăugaţi caracteristici externe, în funcţie de software, sisteme sau servicii. ModulesSpecialDesc=Special module sunt foarte specifice sau rareori folosite module. diff --git a/htdocs/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang index 8a52d47922df5c91a3c005d0fbc6cfced1d6cd53..e1513f3996a6c2bbe27339d1f1d7b47b5ef36137 100644 --- a/htdocs/langs/ru_RU/admin.lang +++ b/htdocs/langs/ru_RU/admin.lang @@ -149,7 +149,6 @@ AutoDetectLang=Autodetect (язык браузера) FeatureDisabledInDemo=Функция отключена в демо - Rights=Разрешения BoxesDesc=Ящики экрана показывают, что часть информации на некоторых страницах. Вы можете выбирать между показ поле или нет, выбрав целевой страницы и нажать кнопку "Включить", или нажав на свалку, чтобы отключить его. -OnlyActiveElementsAreShown=Only elements from <a href=Только элементы <a href="modules.php">позволили модули</a> показаны. ModulesDesc=Dolibarr модулей определяют функциональность, которая включена в программу. Некоторые модули требуют разрешения вы должны предоставить пользователям, после включения модуля. ModulesInterfaceDesc=Dolibarr модули интерфейса позволяет добавлять новые функции в зависимости от внешнего программного обеспечения, систем и услуг. ModulesSpecialDesc=Специальные модули очень специфичны и редко используемых модулей. diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang index d7b3c7de9fb9d6f839d21e2dee7a117a6f4074a1..8de18381e501c147d86a56e815e4a88fd266176d 100644 --- a/htdocs/langs/sl_SI/admin.lang +++ b/htdocs/langs/sl_SI/admin.lang @@ -175,7 +175,7 @@ AutoDetectLang = Samozaznava (jezik iskalnika) FeatureDisabledInDemo = Funkcija onemogočena v demo različici Rights = Dovoljenja BoxesDesc = Polja so področja na zaslonu, ki prikazujejo krajše informacije na nekaterih straneh. Izberete lahko, ali naj se polja prikažejo ali ne, tako da izberete ciljno stran in kliknete 'Aktiviraj', ali kliknete na koš za onemogočenje. -OnlyActiveElementsAreShown = Prikazani so samo elementi <a href="modules.php">omogočenih modulov </a>. +OnlyActiveElementsAreShown = Prikazani so samo elementi <a href="%s">omogočenih modulov </a>. ModulesDesc = Dolibarr moduli določajo, katere funkcije programa so omogočene. Nekateri moduli zahtevajo, da po omogočanju modula dodelite dovoljenje uporabnikom. Kliknite gumb za vklop/izklop v koloni "Status" za omogočanje modula/funkcije. ModulesInterfaceDesc = Vmesnik za Dolibarr module omogoča dodajanje funkcij odvisno od zunanjih programov, sistemov ali storitev. ModulesSpecialDesc = Specialni moduli so zelo specifični ali redko uporabljani moduli. diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang index 12226fd864b3c98b04b8fcdd323942e8863017c0..05ba1cb2f4bcc4b4ea369d3b763b14d4171226d1 100644 --- a/htdocs/langs/sv_SE/admin.lang +++ b/htdocs/langs/sv_SE/admin.lang @@ -174,7 +174,7 @@ AutoDetectLang=Autodetektera (webbläsare språk) FeatureDisabledInDemo=Funktion avstängd i demo Rights=Behörigheter BoxesDesc=Fälten är skärmytan som visar en bit av information om vissa sidor. Du kan välja mellan att visa rutan eller inte genom att välja målsidan och klicka på "Aktivera" eller genom att klicka på soptunnan till att stänga av den. -OnlyActiveElementsAreShown=Endast delar av <a href="modules.php">aktiverade moduler</a> visas. +OnlyActiveElementsAreShown=Endast delar av <a href="%s">aktiverade moduler</a> visas. ModulesDesc=Dolibarr moduler definiera vilka funktionen är aktiverad i programvaran. Vissa moduler kräver behörigheter som du skall ge till användare efter möjliggör modul. ModulesInterfaceDesc=Den Dolibarr moduler gränssnittet kan du lägga till funktioner beroende på yttre programvara, system eller tjänster. ModulesSpecialDesc=Särskilda moduler är mycket specifika eller sällan moduler. diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang index b3fdb75fa6c37d8525789556e62ec9306447f398..2701184245a808296b31e9bff0e64a864b96280b 100755 --- a/htdocs/langs/tr_TR/admin.lang +++ b/htdocs/langs/tr_TR/admin.lang @@ -168,7 +168,7 @@ AutoDetectLang=Otoalgıla (tarayıcı dili) FeatureDisabledInDemo=Demoda özellik devre dışıdır Rights=İzinler BoxesDesc=Kutular, bazı pencerelerde bilgi parçaları gösteren ekran alanlarıdır. Kutunun gösterilmesi ya da gösterilmemesi arasında seçim yapmak için hedef sayfayı seçerek ‘Etkinleştir’ e tıklayın veya çöpkutusuna tıklayarak devre dışı bırakın. -OnlyActiveElementsAreShown=Yalnızca <ahref="modules.php">etkinleştirilmiş modüllerin</a> öğeleri gösterilmiştir. +OnlyActiveElementsAreShown=Yalnızca <a href="%s">etkinleştirilmiş modüllerin</a> öğeleri gösterilmiştir. ModulesDesc=Dolibarr modülleri, yazılımda hangi özelliğin devreye alınacağını tanımlar. Modül devreye alındıktan sonra kullanıcıya bazı izinler vermeniz gerekir. Bir modül/özelliği devreye almak için “Durum” sütunundaki aç/kapa düğmesinde aça tıklayın. ModulesInterfaceDesc=Dolibarr modülleri arayüzü dış yazılım, sistem ya da hizmetlere bağlı olarak özellikler ekler. ModulesSpecialDesc=Özel modüller çok özel ya da seyrek kullanılan modüllerdir. diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang index 5cb5278d70db8cc9ffff8254d238cea7d74c486f..05ca016c9c2e1218988d2f79d6cf7c0cd4c581d8 100644 --- a/htdocs/langs/zh_CN/admin.lang +++ b/htdocs/langs/zh_CN/admin.lang @@ -173,7 +173,7 @@ AutoDetectLang=自动检测(浏览器的语言) FeatureDisabledInDemo=在演示功能禁用 Rights=权限 BoxesDesc=框屏幕区域,显示了在一些网页上的资料。您可以选择显示选择目标页,然后点击'的方块,或不激活',或按一下垃圾桶中禁用它。 -OnlyActiveElementsAreShown=分子只有<a href="modules.php">启用的模块</a>显示。 +OnlyActiveElementsAreShown=分子只有<a href="%s">启用的模块</a>显示。 ModulesDesc=Dolibarr模块定义哪些功能是在软件中启用。有些模块需要您必须授予权限给用户,在启用模块。 ModulesInterfaceDesc=该Dolibarr模块接口允许你添加取决于外部软件,系统或服务功能。 ModulesSpecialDesc=特别是非常具体的模块或很少使用的模块。 diff --git a/htdocs/webservices/admin/webservices.php b/htdocs/webservices/admin/webservices.php index 800fd9cc6af3c759b9a3cac74fae794f2ab893c5..8e5370df465924ed2b87557565e6f45fcb8720c1 100644 --- a/htdocs/webservices/admin/webservices.php +++ b/htdocs/webservices/admin/webservices.php @@ -151,6 +151,9 @@ if ($conf->fournisseur->enabled) print '<br>'; +print '<br>'; +print $langs->trans("OnlyActiveElementsAreShown", DOL_URL_ROOT.'/admin/modules.php'); + $db->close(); llxFooter(); diff --git a/htdocs/webservices/server_invoice.php b/htdocs/webservices/server_invoice.php index 335a29743ff256d535702cbf401ab3d54549f943..7572238264fcdeb0f9a7008ca677e7d1dddbc113 100755 --- a/htdocs/webservices/server_invoice.php +++ b/htdocs/webservices/server_invoice.php @@ -497,7 +497,6 @@ function createInvoice($authentication,$invoice) $errorcode='';$errorlabel=''; $error=0; $fuser=check_authentication($authentication,$error,$errorcode,$errorlabel); - // Check parameters if (! $error) { diff --git a/test/soapui/Dolibarr-soapui-project.xml b/test/soapui/Dolibarr-soapui-project.xml index 85404fdeed89561042f7c269fcbc5e972fb2255d..d5669969a4dcd0e620ef1083bea46c2dbb23512c 100755 --- a/test/soapui/Dolibarr-soapui-project.xml +++ b/test/soapui/Dolibarr-soapui-project.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<con:soapui-project name="Dolibarr" soapui-version="4.0.1" abortOnError="false" runType="SEQUENTIAL" resourceRoot="" xmlns:con="http://eviware.com/soapui/config"><con:settings/><con:interface xsi:type="con:WsdlInterface" wsaVersion="NONE" name="WebServicesDolibarrOtherBinding" type="wsdl" bindingName="{http://www.dolibarr.org/ns/}WebServicesDolibarrOtherBinding" soapVersion="1_1" anonymous="optional" definition="http://localhostdolibarr/dolibarrnew/webservices/server_other.php?wsdl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart="http://localhostdolibarr/dolibarrnew/webservices/server_other.php?wsdl"><con:part><con:url>http://localhostdolibarr/dolibarrnew/webservices/server_other.php?wsdl</con:url><con:content><![CDATA[<definitions targetNamespace="http://www.dolibarr.org/ns/" xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:tns="http://www.dolibarr.org/ns/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns="http://schemas.xmlsoap.org/wsdl/"> +<con:soapui-project name="Dolibarr" soapui-version="3.6.1" abortOnError="false" runType="SEQUENTIAL" resourceRoot="" xmlns:con="http://eviware.com/soapui/config"><con:settings/><con:interface xsi:type="con:WsdlInterface" wsaVersion="NONE" name="WebServicesDolibarrOtherBinding" type="wsdl" bindingName="{http://www.dolibarr.org/ns/}WebServicesDolibarrOtherBinding" soapVersion="1_1" anonymous="optional" definition="http://localhostdolibarr/dolibarrnew/webservices/server_other.php?wsdl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart="http://localhostdolibarr/dolibarrnew/webservices/server_other.php?wsdl"><con:part><con:url>http://localhostdolibarr/dolibarrnew/webservices/server_other.php?wsdl</con:url><con:content><![CDATA[<definitions targetNamespace="http://www.dolibarr.org/ns/" xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:tns="http://www.dolibarr.org/ns/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns="http://schemas.xmlsoap.org/wsdl/"> <types> <xsd:schema targetNamespace="http://www.dolibarr.org/ns/"> <xsd:import namespace="http://schemas.xmlsoap.org/soap/encoding/"/> @@ -94,11 +94,12 @@ <xsd:element name="id" type="xsd:string"/> <xsd:element name="type" type="xsd:int"/> <xsd:element name="desc" type="xsd:string"/> + <xsd:element name="vat_rate" type="xsd:double"/> + <xsd:element name="qty" type="xsd:double"/> + <xsd:element name="unitprice" type="xsd:double"/> <xsd:element name="total_net" type="xsd:double"/> <xsd:element name="total_vat" type="xsd:double"/> <xsd:element name="total" type="xsd:double"/> - <xsd:element name="vat_rate" type="xsd:double"/> - <xsd:element name="qty" type="xsd:double"/> <xsd:element name="date_start" type="xsd:date"/> <xsd:element name="date_end" type="xsd:date"/> <xsd:element name="product_id" type="xsd:int"/> @@ -244,20 +245,25 @@ <ns:createInvoice soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"> <authentication xsi:type="ns:authentication"> <!--You may enter the following 5 items in any order--> - <dolibarrkey xsi:type="xsd:string">?</dolibarrkey> + <dolibarrkey xsi:type="xsd:string">dolibarrkey</dolibarrkey> <sourceapplication xsi:type="xsd:string">aaa</sourceapplication> - <login xsi:type="xsd:string">dmin</login> + <login xsi:type="xsd:string">admin</login> <password xsi:type="xsd:string">admin</password> <entity xsi:type="xsd:string"/> </authentication> <invoice xsi:type="ns:invoice"> <!--You may enter the following 22 items in any order--> + <id xsi:type="xsd:string"></id> + <ref xsi:type="xsd:string"></ref> <ref_ext xsi:type="xsd:string">ref_ext</ref_ext> <thirdparty_id xsi:type="xsd:int">1</thirdparty_id> - <fk_user_author xsi:type="xsd:string">?</fk_user_author> - <fk_user_valid xsi:type="xsd:string">?</fk_user_valid> + <fk_user_author xsi:type="xsd:string"></fk_user_author> + <fk_user_valid xsi:type="xsd:string"></fk_user_valid> <date xsi:type="xsd:date">2010-01-01</date> - <date_due xsi:type="xsd:date"></date_due> + <date_due xsi:type="xsd:date"/> + <date_creation xsi:type="xsd:dateTime">2012-01-01</date_creation> + <date_validation xsi:type="xsd:dateTime">2012-01-01</date_validation> + <date_modification xsi:type="xsd:dateTime">2012-01-01</date_modification> <type xsi:type="xsd:int">1</type> <total_net xsi:type="xsd:double">?</total_net> <total_vat xsi:type="xsd:double">?</total_vat> @@ -265,27 +271,28 @@ <note xsi:type="xsd:string">note</note> <note_public xsi:type="xsd:string">note_public</note_public> <status xsi:type="xsd:int">1</status> - <close_code xsi:type="xsd:string"></close_code> - <close_note xsi:type="xsd:string"></close_note> + <close_code xsi:type="xsd:string"/> + <close_note xsi:type="xsd:string"/> <project_id xsi:type="xsd:string">0</project_id> - <lines xsi:type="ns:LinesArray2"> + <lines xsi:type="ns:LinesArray2"> <!--Zero or more repetitions:--> <line xsi:type="ns:line"> - <!--You may enter the following 14 items in any order--> + <!--You may enter the following 15 items in any order--> <id xsi:type="xsd:string">?</id> - <type xsi:type="xsd:int">1</type> + <type xsi:type="xsd:int">0</type> <desc xsi:type="xsd:string">aaa</desc> - <total_net xsi:type="xsd:double">11.96</total_net> - <total_vat xsi:type="xsd:double">1.96</total_vat> - <total xsi:type="xsd:double">10</total> <vat_rate xsi:type="xsd:double">19.6</vat_rate> <qty xsi:type="xsd:double">1</qty> - <date_start xsi:type="xsd:date">?</date_start> - <date_end xsi:type="xsd:date">?</date_end> - <product_id xsi:type="xsd:int">?</product_id> - <product_ref xsi:type="xsd:string">?</product_ref> - <product_label xsi:type="xsd:string">?</product_label> - <product_desc xsi:type="xsd:string">?</product_desc> + <unitprice xsi:type="xsd:double">10</unitprice> + <total_net xsi:type="xsd:double">10</total_net> + <total_vat xsi:type="xsd:double">1.96</total_vat> + <total xsi:type="xsd:double">11.96</total> + <date_start xsi:type="xsd:date"></date_start> + <date_end xsi:type="xsd:date"></date_end> + <product_id xsi:type="xsd:int"></product_id> + <product_ref xsi:type="xsd:string"></product_ref> + <product_label xsi:type="xsd:string"></product_label> + <product_desc xsi:type="xsd:string"></product_desc> </line> </lines> </invoice> @@ -327,25 +334,7 @@ <close_note xsi:type="xsd:string">?</close_note> <project_id xsi:type="xsd:string">?</project_id> <lines xsi:type="ns:LinesArray2"> - <!--Zero or more repetitions:--> - <line xsi:type="ns:line"> - <!--You may enter the following 14 items in any order--> - <id xsi:type="xsd:string">?</id> - <type xsi:type="xsd:int">?</type> - <desc xsi:type="xsd:string">?</desc> - <total_net xsi:type="xsd:double">?</total_net> - <total_vat xsi:type="xsd:double">?</total_vat> - <total xsi:type="xsd:double">?</total> - <vat_rate xsi:type="xsd:double">?</vat_rate> - <qty xsi:type="xsd:double">?</qty> - <date_start xsi:type="xsd:date">?</date_start> - <date_end xsi:type="xsd:date">?</date_end> - <product_id xsi:type="xsd:int">?</product_id> - <product_ref xsi:type="xsd:string">?</product_ref> - <product_label xsi:type="xsd:string">?</product_label> - <product_desc xsi:type="xsd:string">?</product_desc> - </line> - </lines> + </lines> </invoice> </ns:createInvoice> </soapenv:Body> @@ -713,21 +702,34 @@ <sourceapplication xsi:type="xsd:string">aaa</sourceapplication> <login xsi:type="xsd:string">admin</login> <password xsi:type="xsd:string">admin</password> - <entity xsi:type="xsd:string"></entity> + <entity xsi:type="xsd:string"/> </authentication> <product xsi:type="ns:product"> - <!--You may enter the following 18 items in any order--> + <!--You may enter the following 24 items in any order--> + <id xsi:type="xsd:string">?</id> <ref xsi:type="xsd:string">PPP</ref> - <ref_ext xsi:type="xsd:string"></ref_ext> + <ref_ext xsi:type="xsd:string"/> + <type xsi:type="xsd:string">1</type> <label xsi:type="xsd:string">PPP Label</label> <description xsi:type="xsd:string">Description of PPP</description> + <date_creation xsi:type="xsd:dateTime">?</date_creation> + <date_modification xsi:type="xsd:dateTime">?</date_modification> <note xsi:type="xsd:string">xxxxx</note> - <tobuy xsi:type="xsd:string">1</tobuy> - <tosell xsi:type="xsd:string">0</tosell> - <type xsi:type="xsd:string">1</type> + <status_tobuy xsi:type="xsd:string">?</status_tobuy> + <status_tosell xsi:type="xsd:string">?</status_tosell> <barcode xsi:type="xsd:string">123456</barcode> + <barcode_type xsi:type="xsd:string">?</barcode_type> + <country_id xsi:type="xsd:string">?</country_id> <country_code xsi:type="xsd:string">FR</country_code> + <customcode xsi:type="xsd:string">?</customcode> + <price_net xsi:type="xsd:string">?</price_net> + <price xsi:type="xsd:string">?</price> + <price_base_type xsi:type="xsd:string">?</price_base_type> <stock_alert xsi:type="xsd:string">10</stock_alert> + <stock_real xsi:type="xsd:string">?</stock_real> + <stock_pmp xsi:type="xsd:string">?</stock_pmp> + <canvas xsi:type="xsd:string">?</canvas> + <import_key xsi:type="xsd:string">?</import_key> </product> </ns:createProductOrService> </soapenv:Body> @@ -897,7 +899,12 @@ <xsd:element name="ref" type="xsd:string"/> <xsd:element name="ref_ext" type="xsd:string"/> <xsd:element name="fk_user_author" type="xsd:string"/> - <xsd:element name="date" type="xsd:date"/> + <xsd:element name="client" type="xsd:string"/> + <xsd:element name="supplier" type="xsd:string"/> + <xsd:element name="customer_code" type="xsd:string"/> + <xsd:element name="supplier_code" type="xsd:string"/> + <xsd:element name="customer_code_accountancy" type="xsd:string"/> + <xsd:element name="supplier_code_accountancy" type="xsd:string"/> <xsd:element name="date_creation" type="xsd:dateTime"/> <xsd:element name="date_modification" type="xsd:dateTime"/> <xsd:element name="note" type="xsd:string"/> @@ -916,11 +923,31 @@ <xsd:element name="profid2" type="xsd:string"/> <xsd:element name="profid3" type="xsd:string"/> <xsd:element name="profid4" type="xsd:string"/> - <xsd:element name="prefix" type="xsd:string"/> + <xsd:element name="profid5" type="xsd:string"/> + <xsd:element name="profid6" type="xsd:string"/> + <xsd:element name="capital" type="xsd:string"/> <xsd:element name="vat_used" type="xsd:string"/> <xsd:element name="vat_number" type="xsd:string"/> </xsd:all> </xsd:complexType> + <xsd:complexType name="filterthirdparty"> + <xsd:all> + <xsd:element name="client" type="xsd:string"/> + <xsd:element name="supplier" type="xsd:string"/> + </xsd:all> + </xsd:complexType> + <xsd:complexType name="ThirdPartiesArray"> + <xsd:complexContent> + <xsd:restriction base="SOAP-ENC:Array"> + <xsd:attribute ref="SOAP-ENC:arrayType" wsdl:arrayType="tns:thirdparty[]" xmlns:wsdl1="http://schemas.xmlsoap.org/wsdl/"/> + </xsd:restriction> + </xsd:complexContent> + </xsd:complexType> + <xsd:complexType name="ThirdPartiesArray2"> + <xsd:sequence> + <xsd:element name="thirdparty" type="tns:thirdparty" minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:complexType> </xsd:schema> </types> <message name="getThirdPartyRequest"> @@ -933,17 +960,61 @@ <part name="result" type="tns:result"/> <part name="thirdparty" type="tns:thirdparty"/> </message> + <message name="createThirdPartyRequest"> + <part name="authentication" type="tns:authentication"/> + <part name="thirdparty" type="tns:thirdparty"/> + </message> + <message name="createThirdPartyResponse"> + <part name="result" type="tns:result"/> + <part name="id" type="xsd:string"/> + </message> + <message name="getListOfThirdPartiesRequest"> + <part name="authentication" type="tns:authentication"/> + <part name="filterthirdparty" type="tns:filterthirdparty"/> + </message> + <message name="getListOfThirdPartiesResponse"> + <part name="result" type="tns:result"/> + <part name="thirdparties" type="tns:ThirdPartiesArray2"/> + </message> <portType name="WebServicesDolibarrThirdPartyPortType"> <operation name="getThirdParty"> - <documentation>WS to get Versions</documentation> + <documentation>WS to get a thirdparty from its id, ref or ref_ext</documentation> <input message="tns:getThirdPartyRequest"/> <output message="tns:getThirdPartyResponse"/> </operation> + <operation name="createThirdParty"> + <documentation>WS to create a thirdparty</documentation> + <input message="tns:createThirdPartyRequest"/> + <output message="tns:createThirdPartyResponse"/> + </operation> + <operation name="getListOfThirdParties"> + <documentation>WS to get list of thirdparties id and ref</documentation> + <input message="tns:getListOfThirdPartiesRequest"/> + <output message="tns:getListOfThirdPartiesResponse"/> + </operation> </portType> <binding name="WebServicesDolibarrThirdPartyBinding" type="tns:WebServicesDolibarrThirdPartyPortType"> <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/> <operation name="getThirdParty"> - <soap:operation soapAction="http://www.dolibarr.org/ns/#getVersions" style="rpc"/> + <soap:operation soapAction="http://www.dolibarr.org/ns/#getThirdParty" style="rpc"/> + <input> + <soap:body use="encoded" namespace="http://www.dolibarr.org/ns/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> + </input> + <output> + <soap:body use="encoded" namespace="http://www.dolibarr.org/ns/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> + </output> + </operation> + <operation name="createThirdParty"> + <soap:operation soapAction="http://www.dolibarr.org/ns/#createThirdParty" style="rpc"/> + <input> + <soap:body use="encoded" namespace="http://www.dolibarr.org/ns/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> + </input> + <output> + <soap:body use="encoded" namespace="http://www.dolibarr.org/ns/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> + </output> + </operation> + <operation name="getListOfThirdParties"> + <soap:operation soapAction="http://www.dolibarr.org/ns/#getListOfThirdParties" style="rpc"/> <input> <soap:body use="encoded" namespace="http://www.dolibarr.org/ns/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> </input> @@ -957,7 +1028,7 @@ <soap:address location="http://localhostdolibarr/webservices/server_thirdparty.php"/> </port> </service> -</definitions>]]></con:content><con:type>http://schemas.xmlsoap.org/wsdl/</con:type></con:part></con:definitionCache><con:endpoints><con:endpoint>http://localhostdolibarr/webservices/server_thirdparty.php</con:endpoint></con:endpoints><con:operation isOneWay="false" action="http://www.dolibarr.org/ns/#getVersions" name="getThirdParty" bindingOperationName="getThirdParty" type="Request-Response" inputName="" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Request 1"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhostdolibarr/webservices/server_thirdparty.php</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns="http://www.dolibarr.org/ns/"> +</definitions>]]></con:content><con:type>http://schemas.xmlsoap.org/wsdl/</con:type></con:part></con:definitionCache><con:endpoints><con:endpoint>http://localhostdolibarr/webservices/server_thirdparty.php</con:endpoint></con:endpoints><con:operation isOneWay="false" action="http://www.dolibarr.org/ns/#getThirdParty" name="getThirdParty" bindingOperationName="getThirdParty" type="Request-Response" inputName="" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Request 1"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhostdolibarr/webservices/server_thirdparty.php</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns="http://www.dolibarr.org/ns/"> <soapenv:Header/> <soapenv:Body> <ns:getThirdParty soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"> @@ -974,4 +1045,73 @@ <ref_ext xsi:type="xsd:string"></ref_ext> </ns:getThirdParty> </soapenv:Body> -</soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://www.dolibarr.org/ns/#getVersions"/><con:wsrmConfig version="1.2"/></con:call></con:operation></con:interface><con:properties/><con:wssContainer/></con:soapui-project> \ No newline at end of file +</soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://www.dolibarr.org/ns/#getVersions"/><con:wsrmConfig version="1.2"/></con:call></con:operation><con:operation isOneWay="false" action="http://www.dolibarr.org/ns/#createThirdParty" name="createThirdParty" bindingOperationName="createThirdParty" type="Request-Response" inputName="" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Request 1"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhostdolibarr/webservices/server_thirdparty.php</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns="http://www.dolibarr.org/ns/"> + <soapenv:Header/> + <soapenv:Body> + <ns:createThirdParty soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"> + <authentication xsi:type="ns:authentication"> + <!--You may enter the following 5 items in any order--> + <dolibarrkey xsi:type="xsd:string">?</dolibarrkey> + <sourceapplication xsi:type="xsd:string">?</sourceapplication> + <login xsi:type="xsd:string">?</login> + <password xsi:type="xsd:string">?</password> + <entity xsi:type="xsd:string">?</entity> + </authentication> + <thirdparty xsi:type="ns:thirdparty"> + <!--You may enter the following 33 items in any order--> + <id xsi:type="xsd:string">?</id> + <ref xsi:type="xsd:string">?</ref> + <ref_ext xsi:type="xsd:string">?</ref_ext> + <fk_user_author xsi:type="xsd:string">?</fk_user_author> + <client xsi:type="xsd:string">?</client> + <supplier xsi:type="xsd:string">?</supplier> + <customer_code xsi:type="xsd:string">?</customer_code> + <supplier_code xsi:type="xsd:string">?</supplier_code> + <customer_code_accountancy xsi:type="xsd:string">?</customer_code_accountancy> + <supplier_code_accountancy xsi:type="xsd:string">?</supplier_code_accountancy> + <date_creation xsi:type="xsd:dateTime">?</date_creation> + <date_modification xsi:type="xsd:dateTime">?</date_modification> + <note xsi:type="xsd:string">?</note> + <address xsi:type="xsd:string">?</address> + <zip xsi:type="xsd:string">?</zip> + <town xsi:type="xsd:string">?</town> + <province_id xsi:type="xsd:string">?</province_id> + <country_id xsi:type="xsd:string">?</country_id> + <country_code xsi:type="xsd:string">?</country_code> + <country xsi:type="xsd:string">?</country> + <phone xsi:type="xsd:string">?</phone> + <fax xsi:type="xsd:string">?</fax> + <email xsi:type="xsd:string">?</email> + <url xsi:type="xsd:string">?</url> + <profid1 xsi:type="xsd:string">?</profid1> + <profid2 xsi:type="xsd:string">?</profid2> + <profid3 xsi:type="xsd:string">?</profid3> + <profid4 xsi:type="xsd:string">?</profid4> + <profid5 xsi:type="xsd:string">?</profid5> + <profid6 xsi:type="xsd:string">?</profid6> + <capital xsi:type="xsd:string">?</capital> + <vat_used xsi:type="xsd:string">?</vat_used> + <vat_number xsi:type="xsd:string">?</vat_number> + </thirdparty> + </ns:createThirdParty> + </soapenv:Body> +</soapenv:Envelope>]]></con:request><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://www.dolibarr.org/ns/#createThirdParty"/></con:call></con:operation><con:operation isOneWay="false" action="http://www.dolibarr.org/ns/#getListOfThirdParties" name="getListOfThirdParties" bindingOperationName="getListOfThirdParties" type="Request-Response" inputName="" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Request 1"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhostdolibarr/webservices/server_thirdparty.php</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns="http://www.dolibarr.org/ns/"> + <soapenv:Header/> + <soapenv:Body> + <ns:getListOfThirdParties soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"> + <authentication xsi:type="ns:authentication"> + <!--You may enter the following 5 items in any order--> + <dolibarrkey xsi:type="xsd:string">?</dolibarrkey> + <sourceapplication xsi:type="xsd:string">?</sourceapplication> + <login xsi:type="xsd:string">?</login> + <password xsi:type="xsd:string">?</password> + <entity xsi:type="xsd:string">?</entity> + </authentication> + <filterthirdparty xsi:type="ns:filterthirdparty"> + <!--You may enter the following 2 items in any order--> + <client xsi:type="xsd:string">?</client> + <supplier xsi:type="xsd:string">?</supplier> + </filterthirdparty> + </ns:getListOfThirdParties> + </soapenv:Body> +</soapenv:Envelope>]]></con:request><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://www.dolibarr.org/ns/#getListOfThirdParties"/></con:call></con:operation></con:interface><con:properties/><con:wssContainer/></con:soapui-project> \ No newline at end of file