lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
68,848 Commits 43 Branches 150 Tags 886 MiB
f8b0e535fa
Commit Graph

371 Commits

Author SHA1 Message Date
Frédéric FRANCE
891f8d9442 Fix bug 1692 Can't update phone_pro with the contact webservice 2014-11-22 19:02:15 +01:00
Laurent Destailleur
5e0946bdc2 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/adherents/fiche.php
	htdocs/core/lib/date.lib.php
	htdocs/langs/fr_FR/bills.lang
	htdocs/resource/class/resource.class.php
 2014-11-05 16:37:07 +01:00
Ignacio José Lizarán Rus
fa61faec58 Update server_invoice.php 
Create Facture with mode_reglement and cond_reglement using thirdparty information.
 2014-10-29 17:43:01 +01:00
Florian HENRY
834a6dc2af webservice Thirdparty parameter lastname for invidual creation is now 
lastname and not ref
 2014-10-28 16:50:44 +01:00
Cubexed
08c9ff275a Added date start/end at webservice createOrder 2014-10-16 18:09:16 +02:00
Laurent Destailleur
9768550696 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	ChangeLog
	htdocs/categories/fiche.php
	htdocs/comm/action/index.php
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/fourn/fiche.php
	htdocs/product/composition/fiche.php
	htdocs/product/price.php
	htdocs/projet/tasks/task.php
	htdocs/projet/tasks/time.php
 2014-10-12 02:54:34 +02:00
Laurent Destailleur
cd8936a224 Clean deprecated code. 2014-10-11 15:04:42 +02:00
Laurent Destailleur
5601c979ab New: Can search list of thirdparties from web service on part of name. 2014-10-04 17:29:04 +02:00
Laurent Destailleur
78de38d0db Merge pull request #1923 from GPCsolutions/fixws 
Fixed invoices webservice
 2014-09-29 15:39:19 +02:00
Florian HENRY
96c5771718 Fix web service category 2014-09-26 16:18:32 +02:00
Laurent Destailleur
a3436135c9 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/projet/activity/list.php
 2014-09-26 13:34:31 +02:00
Raphaël Doursenaud
f7aa08f3fd Fixed invoices webservice 2014-09-24 17:42:05 +02:00
Laurent Destailleur
a4d8739477 Qual: Clean a lot of deprecated code 2014-09-24 01:35:29 +02:00
Laurent Destailleur
3b53ccbe44 Merge pull request #1893 from braito4/patch-2 
problem with type of product
 2014-09-22 23:46:48 +02:00
Marcos García de La Fuente
ca9e33e809 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into oop-pdf 2014-09-21 18:00:56 +02:00
Laurent Destailleur
2a9275d0de Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/societe/consumption.php
 2014-09-19 11:09:51 +02:00
Raphaël Doursenaud
b9954f5b2b PHP 5.6 compatibility 
$HTTP_RAW_POST_DATA is now DEPRECATED
Replaced all usages by the recommended file_get_contents("php://input")
 2014-09-16 21:21:34 +02:00
Marcos García de La Fuente
c195c6fd10 Removed deprecated usage of commande_pdf_create 2014-09-16 20:35:31 +02:00
braito4
144da16391 Missing date_start, date_end in webserver server_invoice.php 2014-09-16 19:42:11 +02:00
braito4
b7ef2db5d9 problem with type of product 
the column should be product_type
 2014-09-16 19:33:07 +02:00
aspangaro
f774ff487b Merge branch 'Upstream/develop' 2014-08-18 11:56:49 +02:00
aspangaro
1a87d98357 Qual: Renamed table llx_c_civilite into llx_c_civility 
field civilite into label in the same table and field civilite into civility in other table
 2014-08-12 06:03:27 +02:00
aspangaro
0738103da8 Renamed llx_c_pays to llx_c_country & field "libelle" to "label" 2014-08-10 13:37:39 +02:00
mika31
f96f8384e6 Webservice thirdparty / sale representative 
Little patch to add capability to associate (one) sale representative on thirdparty creation.
 2014-07-23 20:23:37 +02:00
Marcos García de La Fuente
ec661d0c6c Removed index.php and replaced them with blank index.html as it is more appropriate 2014-07-12 23:18:57 +02:00
Marcos García de La Fuente
7e1cf124b8 Merge branch 'develop' into syslog 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/product/class/product.class.php
	htdocs/product/stock/lib/replenishment.lib.php
	htdocs/societe/soc.php
 2014-07-02 21:20:02 +02:00
Laurent Destailleur
51270ab28a Merge pull request #1614 from guerinaxel/patch-5 
Add extrafields to productorservice webservice
 2014-06-26 23:05:31 +02:00
Laurent Destailleur
31c60cc8ce Merge pull request #1613 from guerinaxel/patch-4 
Adding var mode_reglement_id to facture
 2014-06-26 21:25:01 +02:00
Marcos García de La Fuente
9fbd7806f0 More substitutions 2014-06-12 11:31:53 +02:00
Raphaël Doursenaud
c48c3a9d91 Qual: remove PHP closing tag (again) 
These were reintroduced by careless merge
 2014-05-26 13:51:25 +02:00
guerinaxel
1e3b8e56f2 Add extrafields to productorservice webservice 2014-05-22 12:10:40 +02:00
guerinaxel
0d71350c76 Rename mode_reglement_id into payment_mode_id 2014-05-22 08:54:14 +02:00
guerinaxel
30a25251d9 Adding var mode_reglement_id to facture 
Adding var mode_reglement_id to facture in order to change the payment method.
 2014-05-20 09:59:42 +02:00
Laurent Destailleur
9b38857c9a Fix: When creating an invoice, we must first create it as draft and then 
after validate.
 2014-05-13 14:24:27 +02:00
Laurent Destailleur
63100c9c06 Properties "civilite_id" were renamed into "civility_id". 2014-05-05 00:23:09 +02:00
Laurent Destailleur
c2c0a9b4bb Merge pull request #1568 from GPCsolutions/closingtagremoval 
Qual: Remove the closing PHP tag
 2014-05-04 18:08:37 +02:00
Laurent Destailleur
d25778f12b Qual: Removed duplicate column "datea" into table llx_societe 
(duplicated with column tms).
 2014-05-04 16:59:13 +02:00
Raphaël Doursenaud
f8f502d013 Removed closing php tag 
http://php.net/manual/en/language.basic-syntax.phptags.php
 2014-05-03 18:18:44 +02:00
Laurent Destailleur
f5b0651809 New: Add webservcie to delete a product. 
Qual: More webservices in phpunit.
 2014-05-02 16:47:54 +02:00
jfefe
f9e08c23d9 Add multilang support into getProductOrService webservice method 2014-04-25 13:32:31 +02:00
jfefe
181a49c18c Add multilang support into getProductsForCategory webservice method 2014-04-25 13:31:38 +02:00
jfefe
e6e45862a1 Work into multilang into product webservice 2014-04-25 13:31:38 +02:00
fxw
f86d49c1ac Update server_thirdparty.php 
For the method getListOfThirdParties, return all the extrafieldsOptions of the thirdParty Object
 2014-04-16 16:33:36 +02:00
jfefe
f8a98c51bf Qual : phpdoc 2014-02-20 01:41:45 +01:00
jfefe
75d2215733 New : can use translations into products webservice 
Add lang parameter to force langage
 2014-02-20 01:39:48 +01:00
Laurent Destailleur
7078970ed1 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2014-02-05 21:03:05 +01:00
jfefe
1ae87887fb Fix into user webservices : better error management and country detection 
- Avoid errors when creating an user with thirdparty
- Add country detection in webservices when country_code is filled
 2014-02-04 18:03:22 +01:00
Laurent Destailleur
1cf058b8e9 Bad comment 2014-01-12 15:12:25 +01:00
Cédric Salvador
18b163c6db allow the webservice to create a private individual 2013-12-20 17:03:24 +01:00
Cédric Salvador
168412a2d6 Wrong parameters order in the function call 2013-12-19 16:06:59 +01:00
Cédric Salvador
0a0ef548ef Solved some bugs in order creation and validation 2013-12-19 16:06:59 +01:00
Laurent Destailleur
f0eb98c27a Fix: Serious pb with loading stocks. If we use product->stock_reel or 
product->stock_warehoure[], we must call product->load_stock() after the
product->fetch().
 2013-12-10 19:42:49 +01:00
Florian Henry
05e0af0f23 WebService contact with statut (the new field) 2013-11-14 19:41:27 +01:00
Florian Henry
64745ecefe Add function field into webservice contact 2013-10-30 09:52:39 +01:00
Laurent Destailleur
c81bb60384 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/core/lib/pdf.lib.php
	htdocs/public/cron/cron_run_jobs.php
 2013-10-27 02:33:03 +02:00
Florian Henry
6985a4fe3b Fix web service_contact.php civilite_id vs civility_id 2013-10-26 10:59:31 +02:00
Florian Henry
ec8cee4d41 Add link to contact webservice that is already available 2013-10-25 11:39:14 +02:00
Laurent Destailleur
2061739371 Fix: Update must be done with id 2013-10-01 17:49:56 +02:00
Laurent Destailleur
957ff08458 New: Add update method for web service product. 2013-10-01 11:59:35 +02:00
Laurent Destailleur
065c87d81c Qual: uniformize code: property ->tel on objects is now ->phone 
everywhere
 2013-09-25 19:58:22 +02:00
Laurent Destailleur
6c47ee22b4 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	.travis.yml
 2013-09-11 23:12:47 +02:00
jfefe
5abbee02c8 Fix : missing lib / bad property name in order webservice 2013-09-10 11:23:36 +02:00
Laurent Destailleur
1b526b7aa5 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	.travis.yml
	htdocs/fourn/facture/index.php
 2013-09-09 20:00:12 +02:00
jfefe
13e235ca8a Fix: permission check in invoice webservice 
remove comment & indent code
 2013-09-09 17:08:22 +02:00
Raphaël Doursenaud
4efe215b0c Qual: removed a bunch of duplicated array keys 2013-09-05 17:00:18 +02:00
Florian Henry
4932c116e0 fix mispelling 2013-08-15 12:50:16 +02:00
Florian Henry
472d218372 Add category into filter into webservice thirdparty method 
getListOfThirdParties
 2013-08-15 10:39:59 +02:00
Laurent Destailleur
afae841ae4 Fix: Permissions on files 2013-08-06 00:36:21 +02:00
Laurent Destailleur
c41a955cbe Fix: Permissions on files 2013-08-06 00:36:04 +02:00
Laurent Destailleur
5385d87995 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/langs/ca_ES/admin.lang
	htdocs/langs/ca_ES/errors.lang
	htdocs/langs/ca_ES/main.lang
	htdocs/langs/ca_ES/opensurvey.lang
	htdocs/langs/ca_ES/paybox.lang
	htdocs/langs/ca_ES/products.lang
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/es_ES/errors.lang
	htdocs/langs/es_ES/main.lang
	htdocs/langs/es_ES/products.lang
 2013-07-05 21:56:54 +02:00
Florian Henry
1e089ef74a Reset demo webservice to NORUN 2013-07-05 09:19:56 +02:00
Laurent Destailleur
af4651f1a2 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	build/perl/virtualmin/dolibarr.pl
	htdocs/core/lib/files.lib.php
	htdocs/langs/en_US/projects.lang
	htdocs/langs/fr_FR/projects.lang
	htdocs/public/paybox/paymentko.php
	htdocs/public/paybox/paymentok.php
	htdocs/public/paypal/paymentko.php
	htdocs/public/paypal/paymentok.php
	htdocs/webservices/server_other.php
 2013-06-25 23:22:00 +02:00
jfefe
54bf3fd516 Add parameter to force user in dol_check_access_document function 
This required by webservice where global $user is not available
 2013-06-25 15:09:51 +02:00
Regis Houssin
05bd035488 Fix: convert line delimiters 2013-06-24 17:34:22 +02:00
Raphaël Doursenaud
686f5add82 Normalized line endings to LF 2013-06-05 16:12:07 +02:00
Laurent Destailleur
5bba5782a4 Merge remote-tracking branch 'origin/3.4' into develop 2013-05-29 21:22:27 +02:00
Florian Henry
3ddb410e2e Change comment on dol_include_once method 2013-05-28 17:53:56 +02:00
Laurent Destailleur
393ad1447a Qual: Uniformize permission code between viewimage.php and document.php 2013-05-16 15:46:54 +02:00
Laurent Destailleur
8f214a77c5 Fix: Fix error with linux rules 2013-04-30 21:31:35 +02:00
fhenry
a06581771c Reveiw extrafield for womplaiance with wiki 
http://wiki.dolibarr.org/index.php/Extrafields
 2013-04-26 10:29:14 +02:00
Laurent Destailleur
023b6f2e8b Fix: Use entity 2013-04-25 10:22:08 +02:00
jfefe
b5e66cc492 Mutualize code for security check when accessing a document by document.php and bywebservice 2013-04-22 15:00:29 +02:00
jfefe
60382f4b2c New webservice to retrieve a document (work on invoice, propal, order and generic) 2013-04-22 13:18:40 +02:00
Laurent Destailleur
750b30863f Qual: Clean code from things that should be inside external module. 2013-04-11 09:15:41 +02:00
fhenry
275bf67bb7 [ task #811 ] Uniformanize note field 2013-04-09 17:18:07 +02:00
Laurent Destailleur
ff3c8ec0be Fix: Better error management 2013-04-07 15:16:19 +02:00
Laurent Destailleur
89365786a8 New: enhance tool fixdosfiles.sh 
Convert DOS files to unix
 2013-03-30 14:27:13 +01:00
Laurent Destailleur
298ba17e8f Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/exports/class/export.class.php
	htdocs/webservices/server_user.php
 2013-03-15 01:10:56 +01:00
jfefe
c83691e35a Missing field fk_thirdparty in user webservice 2013-03-12 20:57:58 +01:00
Laurent Destailleur
484c39435c Fix: Bad format of WSDL for orders. Miscellaneous fixes into WS. 2013-03-12 15:25:58 +01:00
Laurent Destailleur
fc3483a4bb Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/webservices/server_user.php
 2013-03-12 14:55:13 +01:00
Laurent Destailleur
bb2776f4cc Fix: Bad field 2013-03-12 13:37:34 +01:00
Laurent Destailleur
fe072d992c Fix: WSDL of productorservice was not valid. Normalize field names. 2013-03-12 10:35:24 +01:00
Laurent Destailleur
9527174300 Fix: WSDL of productorservice was not valid. Normalize field names. 2013-03-12 10:31:28 +01:00
Laurent Destailleur
bcf694c255 Qual: Remove deprecated code. 2013-03-12 10:03:19 +01:00
Grand Philippe
44dee53350 english language standardization 2013-02-25 18:21:12 +01:00
Grand Philippe
b081589129 english language standardization 2013-02-25 09:52:24 +01:00
Grand Philippe
86de772b31 english language standardization 2013-02-24 17:08:52 +01:00
jfefe
4bf550b25c Fix : bad permission in webservice to get contact 2013-02-20 11:37:44 +01:00
jfefe
cb0404a750 New webservice method to update contact 2013-02-20 11:15:05 +01:00
jfefe
3780d0fde6 New webservice method to change user password 2013-02-14 13:15:55 +01:00
jfefe
ed92e91cc0 Fix : wrong value for contact_id when call getUser webservice method (contact_id is variable name in user.class) 2013-01-29 03:59:23 +01:00
jfefe
9b28f98119 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into webservices 2013-01-23 16:39:49 +01:00
jfefe
c7df80a6b5 Add extrafields for webservice contact / missing fields 2013-01-23 16:34:21 +01:00
Regis Houssin
131dd663cb Fix: missing webservices and code more simple 2013-01-22 11:28:53 +01:00
jfefe
a03099bd58 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into webservices 2013-01-21 15:13:43 +01:00
jfefe
2276addef7 Fix : bad value for order line's price when creating an order by webservice / remove duplicate code 2013-01-21 15:13:08 +01:00
Regis Houssin
71dd160c41 Fix: uniformize name 2013-01-21 14:35:49 +01:00
Regis Houssin
5b34f6ba4e Merge pull request #622 from jfefe/webservices 
Missing societe_id for user when called by webservice
 2013-01-21 05:33:14 -08:00
fhenry
7cc548db31 Force get list of extrafield even if external module manage extrafield 2013-01-21 13:52:59 +01:00
fhenry
91e86c5a59 Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3 2013-01-21 13:48:29 +01:00
fhenry
bc8c36b08f Add parameters force get Extarfield list from ll_extrafield even if 
external extrafield module is enabled
 2013-01-21 13:48:15 +01:00
jfefe
a201d8cea0 Fix : bad classname in webservice to create an order 2013-01-21 11:43:22 +01:00
jfefe
8d8e649646 Rename societe_id -> id_thirdparty in webservice method to get an user 2013-01-21 11:42:25 +01:00
jfefe
b76fd1804b Missing societe_id for user when called by webservice 2013-01-20 15:31:24 +01:00
jfefe
7a60bd0b3c Fix : missing class / bad user when create thirdparty with contact and 
user by webservice method
 2013-01-20 12:39:26 +01:00
jfefe
1ab6fe6c21 Fix : missing class / bad user when create thirdparty with contact and 
user by webservice method
 2013-01-20 11:56:56 +01:00
fhenry
e4b704f76d Update web service 2013-01-18 11:10:56 +01:00
fhenry
685400c20e Fix bug on web service 2013-01-17 18:49:21 +01:00
fhenry
9d5ab6daa0 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-01-17 18:04:47 +01:00
fhenry
f665980ef0 Fix bug on update thirdpartty webservice 2013-01-17 18:03:10 +01:00
Laurent Destailleur
d11cee399a Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	COPYRIGHT
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
	htdocs/install/mysql/tables/llx_c_availability.sql
 2013-01-16 15:45:17 +01:00
Laurent Destailleur
8d206fdfb0 Prepare move to other licence. For the moment all answers for licence 
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
 2013-01-16 15:36:08 +01:00
Laurent Destailleur
0b045a2d96 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/core/boxes/box_activity.php
	htdocs/filefunc.inc.php
 2013-01-16 14:11:19 +01:00
fhenry
1605e72adb Add update actioncomm webservice method 
Fix bug on update thridparty webservice method
 2013-01-15 21:43:11 +01:00
fhenry
b6b9f06a72 Remove bad retrun parameters 2013-01-15 18:32:14 +01:00
fhenry
10ed8c141e Update method in thirdparty web service 2013-01-10 23:30:26 +01:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Regis Houssin
5740c7e694 Fix: change for a neutral email 2012-12-30 15:11:07 +01:00
Laurent Destailleur
e39ec132e5 Fix: Checkstyle 2012-12-19 20:59:08 +01:00
Regis Houssin
fb0869e0d0 Merge pull request #549 from jfefe/webservices 
New webservice method to create a thirdparty with contact and user
 2012-12-18 02:49:45 -08:00
jfefe
0d8969e2a6 New webservice method to create a thirdparty with contact and user 2012-12-18 11:17:46 +01:00
Regis Houssin
65090c582d Fix: checkstyle 2012-12-15 11:39:47 +01:00
fhenry
0e1d83c698 Change sample data for createThirdParty 2012-12-13 19:58:36 +01:00
fhenry
d03d81a174 Merge remote-tracking branch 'origin/develop' into develop 2012-12-13 19:47:27 +01:00
fhenry
ff5f01646a Web Service Agenda/Actioncomm with extrafields 2012-12-13 19:11:03 +01:00
fhenry
605d236ecc WebService Agenda/Actioncomm 2012-12-13 19:09:40 +01:00
fhenry
3fc51c2786 Commit without password 2012-12-13 12:50:52 +01:00
fhenry
14c1616adb Full standard extrafields management in Thirds Party Web service 2012-12-13 12:34:00 +01:00
fhenry
574a950dc6 Add third party extrafield in web service exposure 2012-12-08 13:30:39 +01:00
jfefe
9a8f81c740 Remove deprecated fields 
fix : data is an array, not an object
 2012-12-05 06:42:05 +01:00
jfefe
8ae10ef9f0 New webservice methods for contact : 
- new method to get contact info
- new method to create a contact
- new method to get a list of contact for a thirdparty
 2012-12-05 03:47:25 +01:00
jfefe
771634c66b Add contact info when get an user by webservice 2012-12-05 02:11:11 +01:00
Laurent Destailleur
72608e7a72 Fix: Checkstyle 2012-11-19 23:43:14 +01:00
jfefe
7157869371 New webservice for order with method to get, create and valid an order 2012-11-19 12:14:51 +01:00
jfefe
d9d01c80b0 Add information about price when call a product by webservice 2012-11-19 00:35:01 +01:00
jfefe
324b11ebb9 Add comment 2012-11-18 13:20:27 +01:00
jfefe
f47ce7b220 New webservice to fetch categories 2012-11-18 13:15:19 +01:00
jfefe
0f789f6ad3 New webservice method to get list of product for a specific category 2012-11-17 23:40:58 +01:00
jfefe
40a3704739 New webservice method to get list of usergroups 2012-11-17 23:21:12 +01:00