Laurent Destailleur
a462cd232d
Merge remote-tracking branch 'origin/3.7' into 3.8
2015-12-13 16:09:09 +01:00
Laurent Destailleur
4a88c9ea9f
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/product/class/product.class.php
2015-12-13 15:53:57 +01:00
Raphaël Doursenaud
c0862762a5
Fix #3930 Removed executable bit
...
These files doesn't contain executable code and may pose a security
threat.
2015-12-09 13:28:36 +01:00
philippe grand
0e343ae3b2
syntax error
2015-10-08 09:34:02 +02:00
Laurent Destailleur
2f2b0df6f8
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/contact/exportimport.php
htdocs/contact/info.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.form.class.php
htdocs/core/modules/DolibarrModules.class.php
htdocs/core/modules/modSociete.class.php
htdocs/core/tpl/document_actions_pre_headers.tpl.php
htdocs/langs/fr_FR/categories.lang
htdocs/main.inc.php
htdocs/product/reassort.php
htdocs/projet/list.php
htdocs/societe/info.php
2015-07-19 12:26:31 +02:00
Raphaël Doursenaud
953a21b55e
FIX #3262 Webservice getProductsForCategory()
...
Wrong variable name was used!
2015-07-17 18:02:44 +02:00
Arnaud Aujon
3003b41a88
add test for invoices API
2015-05-28 16:57:28 +02:00
Arnaud Aujon
05a7ab158b
add deleteThirdParty api call + add tests
2015-05-28 16:56:45 +02:00
Arnaud Aujon
278d447e45
Use Constant for status
2015-05-27 15:42:34 +02:00
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
