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
Arnaud Aujon
6d5555948e Merge remote-tracking branch 'upstream/develop' into 3.7-webservices-fix 
Conflicts:
	test/phpunit/WebservicesInvoicesTest.php
 2015-05-21 13:11:41 +02:00
Laurent Destailleur
a258370f8a Prepare code for generic solution where all path are forged using 
get_exdir.
 2015-05-18 22:25:51 +02:00
Arnaud Aujon Chevallier
4fd8d6c05a fix typo 2015-05-05 21:37:10 +02:00
Arnaud Aujon Chevallier
d020c4133a webservice_order : return all necessary fields 2015-05-05 10:26:05 +02:00
Arnaud Aujon Chevallier
8b753dc743 fix typo 2015-05-05 10:05:13 +02:00
Arnaud Aujon
d27934419c fix log 2015-05-04 11:36:53 +02:00
Arnaud Aujon
d8027bd71d add thirdparty_id to get invoice 2015-05-04 11:36:40 +02:00
Arnaud Aujon
ef08283bbd Merge branch '3.7-webservices-fix' of https://github.com/aaujon/dolibarr into 3.7-webservices-fix 2015-05-04 10:36:17 +02:00
jfefe
7e0357dcf9 FIX : remove deprecated property 'libelle' on product object 2015-05-04 03:03:24 +02:00
Frédéric FRANCE
d8af7a45f8 Typo 2015-05-01 19:10:47 +02:00
Laurent Destailleur
5b3b180c10 NEW Web service to create or update product can correct stock during 
creation/update.
 2015-04-27 01:36:13 +02:00
Arnaud Aujon
4e10b94b6b Add webservice method createInvoiceFromOrder 2015-04-25 00:38:32 +02:00
Arnaud Aujon
fa9cb49fcb add updateInvoice webservice call 2015-04-24 23:42:35 +02:00
Arnaud Aujon
918d59b0d4 fix updateOrder result values 2015-04-24 23:41:54 +02:00
Arnaud Aujon
13cfae2eb6 payment_mode_id should be in Invoice not InvoiceLine 2015-04-24 23:02:59 +02:00
Arnaud Aujon
c0506918b6 Merge remote-tracking branch 'upstream/3.7' into 3.7-webservices-fix 2015-04-24 21:34:57 +02:00
Arnaud Aujon
97fc99517e Fixes : contact webservice fix update using ref_ext 2015-04-22 12:47:45 +02:00
Arnaud Aujon
54ffaea000 Merge remote-tracking branch 'upstream/3.7' into 3.7-webservices-fix 2015-04-22 12:33:53 +02:00
Arnaud Aujon
afc4d89c64 Orders webservice : Generate pdf document on valid 2015-04-20 20:18:17 +02:00
jfefe
c905f88498 Change generic and setup image title 2015-04-18 23:13:48 +02:00
Laurent Destailleur
9dd73de9b0 Merge branch 'fr-2613' of https://github.com/marcosgdf/dolibarr into marcosgdf-fr-2613 
Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-04-18 20:47:20 +02:00
Marcos García de La Fuente
dc790ff586 NEW: Feature request: A page to merge two thirdparties into one #2613 2015-04-18 20:41:09 +02:00
philippe grand
eaf0fda6aa fix syntax errors 2015-04-18 18:07:41 +02:00
Marcos García de La Fuente
cc1d298f29 Merge branch 'develop' into constants 
Conflicts:
	htdocs/commande/card.php
	htdocs/compta/facture/class/facture.class.php
 2015-03-30 02:36:46 +02:00
Laurent Destailleur
1202d63f98 Indent 2015-03-23 23:25:07 +01:00
Marcos García de La Fuente
094538c07b Implemented constants in Commande, Facture and Propal 2015-03-15 11:48:57 +01:00
Laurent Destailleur
20d5624440 Closed #2414 2015-03-04 20:34:41 +01:00
Laurent Destailleur
e3713c8b6d Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/admin/tools/eaccelerator.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/dispatch.php
 2015-02-19 00:01:26 +01:00
Laurent Destailleur
774389940e Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/comm/propal/list.php
	htdocs/compta/bank/ligne.php
	htdocs/compta/resultat/clientfourn.php
	htdocs/compta/salaries/fiche.php
	htdocs/core/lib/functions.lib.php
	htdocs/fourn/facture/paiement.php
 2015-02-18 23:51:41 +01:00
Laurent Destailleur
ceb3920381 Merge pull request #2346 from aaujon/3.6-webservice-order 
fix typo in createOrder
 2015-02-18 23:00:06 +01:00
Laurent Destailleur
8f339712ab Merge pull request #2338 from aaujon/3.6-webservice-product-barcode 
FIXED : product webservice can now save barcode
 2015-02-18 22:24:20 +01:00
Laurent Destailleur
e3885d6d73 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/lib/tax.lib.php
 2015-02-10 21:36:38 +01:00
Laurent Destailleur
ddb95e5765 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/comm/mailing/fiche.php
	htdocs/compta/paiement/liste.php
	htdocs/contact/class/contact.class.php
	htdocs/core/lib/tax.lib.php
	htdocs/core/modules/expedition/doc/pdf_merou.modules.php
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
	htdocs/langs/en_US/agenda.lang
	htdocs/webservices/server_contact.php
 2015-02-10 21:33:43 +01:00
Arnaud Aujon Chevallier
863c1f7a13 fix typo in createOrder 2015-02-10 13:21:36 +01:00
Arnaud Aujon Chevallier
5747dbfe9b FIXED : product webservice can now save barcode 2015-02-09 13:55:43 +01:00
Laurent Destailleur
d10e28db36 Merge pull request #2326 from aaujon/3.6-webservice-order 
FIXES Webservice : fk_delivery_address not saved
 2015-02-07 23:49:31 +01:00
Arnaud Aujon
65efa7ddf7 FIXED #1824 Add ref_ext for Contact webservices 
Add possibility to use ref_ext to reference contact using webservice, field was present but not saved and not used to fetch object
 2015-02-05 14:28:16 +01:00
Arnaud Aujon Chevallier
eb2c5c29b7 FIXES Webservice : fk_delivery_address not saved 2015-02-05 13:33:58 +01:00
Ying-Chun Liu (PaulLiu)
7569b32281 Fix: webservices productorservice not updating the price. 
The product.php.class provides another method updatePrice() to update the
price of products or services. We should call updatePrice() when we found the
SOAP client changes the price or price_net.

Signed-off-by: Ying-Chun Liu (PaulLiu) <paulliu@debian.org>
 2015-01-29 00:57:54 +08:00
Laurent Destailleur
cd2a9d0e09 Merge remote-tracking branch 'origin/3.7' into develop 2015-01-10 01:07:55 +01:00
Laurent Destailleur
87f70f2d22 Fixed: property must be called billed into web service. 
Fixed: web service to create order was useless. it was not possible to
change status.
 2015-01-10 01:07:18 +01:00
Laurent Destailleur
2a3bb96c34 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/ecm.lib.php
 2014-12-22 03:14:22 +01:00
Laurent Destailleur
8996953077 Fix: error reported by scrutinizer 2014-12-20 15:42:03 +01:00
Laurent Destailleur
4769e26d8e Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	ChangeLog
 2014-12-18 12:34:41 +01:00
Florian HENRY
5745029942 Change credential test data in WS demo 2014-12-15 11:33:09 +01:00
Laurent Destailleur
d9cb9c1585 Merge pull request #2102 from aspangaro/develop-center 
Task 1603 - Remove <center> deprecated HTML5 tags
 2014-11-27 23:58:44 +01:00
jfefe
1b35c5e77b Missing extrafields management for order webservice 2014-11-27 12:56:10 +01:00
aspangaro
ef991e6c5d HTML5 - <center> is deprecated - Need CSS - continue working 2014-11-24 06:43:15 +01:00
Laurent Destailleur
1635f725c8 Merge remote-tracking branch 'origin/3.6' into 3.7 2014-11-23 16:51:25 +01:00
Laurent Destailleur
1f986014f1 Merge remote-tracking branch 'origin/3.5' into 3.6 2014-11-23 16:50:08 +01:00
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