Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-05 17:18:13 +01:00
Code Issues Packages Projects Releases Wiki Activity
69,558 Commits 36 Branches 190 Tags
04d33f45946a9f342024bd8b51f38bb362e0e11e
Commit Graph

371 Commits

Author SHA1 Message Date
Jan
ddbfaf0788 wrong position of counter reset 
extrafields will work now ;) and not the first product gets the last extrafields values
 2018-08-12 19:16:49 +02:00
Laurent Destailleur
04934cc4aa Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/projet/tasks/time.php
 2018-02-27 19:18:43 +01:00
Laurent Destailleur
41638e6dff Fix back link of look and feel v7 2018-02-26 09:20:05 +01:00
Laurent Destailleur
b4446764f8 Clean code of deprecated usage 2018-02-21 14:48:25 +01:00
Laurent Destailleur
9d10eb57f2 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	dev/dolibarr_changes.txt
	htdocs/compta/facture/card.php
	htdocs/compta/facture/list.php
	htdocs/main.inc.php
 2017-12-20 13:28:41 +01:00
Laurent Destailleur
ef9468f78a Fix missing field label 2017-12-12 11:48:51 +01:00
Laurent Destailleur
e9eeb59068 Revert "Add invoice label in supplier invoice web service" 
This reverts commit 8b288d99ff.
 2017-12-12 11:45:12 +01:00
Laurent Destailleur
8b288d99ff Add invoice label in supplier invoice web service 2017-12-12 11:43:53 +01:00
Laurent Destailleur
b07895a26a Fix for php7.2 2017-11-17 18:04:55 +01:00
Laurent Destailleur
ede1f3fdfc PHP7.2 2017-11-17 17:53:20 +01:00
Laurent Destailleur
d40dda83cf Add API "close" for proposals 
Standardize code
 2017-10-18 11:10:08 +02:00
Laurent Destailleur
e3370b6a98 FIX #7265 2017-08-23 12:47:59 +02:00
Regis Houssin
b66da3d148 New: big refactorization of multicompany transverse mode 2017-06-06 10:23:33 +02:00
Laurent Destailleur
a28f8c84e4 Fix travis error 2017-05-18 22:23:59 +02:00
cam.lafit
240371b59d UPDATE : add warehouse information on order creation 
* If stock management is enabled we must done information about warehouse source
If any warehouse is provided, client must send 0.
 2017-05-18 10:47:08 +02:00
cam.lafit
ec25869ec6 FIX : UpdateInvoice create object 
* To update data, function must work on invoice object
 2017-05-18 10:47:07 +02:00
cam.lafit
682f6f838e Change argument list CreateInvoiceFromOrder 
* invoice data are not mandatory
Only order information are required
 2017-05-18 10:36:37 +02:00
cam.lafit
545e41b858 Fix : CreateInvoiceFromOrder result 
* We should be return same informations as other CreateInvoice function
* Also invoice data can't be converted correctly by NuSoap, we can have some PHP error with invoice object
 2017-05-18 10:34:17 +02:00
cam.lafit
94ca528860 FIX : CreateInvoiceFromOrder prototype 
* SOAP declaration must follow function argument list
 2017-05-18 10:33:12 +02:00
cam.lafit
368fb314fe FIX : missing object on createInvoiceFromOrder 
* To create an invoice from order, we must have an order first
Load class as requirment
 2017-05-18 10:22:15 +02:00
cam.lafit
2bf1f848d6 Provide payment SOAP webservices 
* Backport from https://github.com/nikkow/dolibarr-payment-webservice
 2017-05-18 10:18:45 +02:00
Laurent Destailleur
d7e10085b8 Clean code. Using 2 different key for a param is not more allowed. 2017-05-05 18:42:11 +02:00
Laurent Destailleur
12ca11e2fa Fix regression 2017-04-14 15:42:58 +02:00
Laurent Destailleur
72e149e1a6 FIX SEC Improve CSRF protection. Reduce usage of NOCSRFCHECK. 2016-09-08 12:12:00 +02:00
Laurent Destailleur
acdce83f9c Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/product/price.php
 2016-09-02 22:37:01 +02:00
Laurent Destailleur
e19743519b FIX #5660 2016-09-02 21:44:52 +02:00
Laurent Destailleur
78b2e9e4bf FIX #5651 2016-09-02 21:40:07 +02:00
Juanjo Menent
a037e2f2d6 FIX #5479 using uninitialized variable $socid and other stuffs 2016-07-15 23:14:15 +02:00
Laurent Destailleur
e723966583 FIX: Qty in stock must be float like it is in stock movement. 
FIX: Can't create a stock transfer from product card
Performance enhancement of stock information loading.
 2016-04-28 11:01:56 +02:00
placid0w
d043c9ce80 Fix #5054 2016-04-21 01:56:36 +02:00
Laurent Destailleur
4b401a03c8 Merge pull request #5028 from marcosgdf/fr-4524 
NEW Renamed ActionComm::add function to ActionComm::create
 2016-04-21 01:16:46 +02:00
placid0w
7bf9c2144e Fix #5054 2016-04-20 15:43:14 -03:00
Marcos García de La Fuente
84b58d27e6 NEW Renamed ActionComm::add function to ActionComm::create 2016-04-16 21:41:06 +02:00
Laurent Destailleur
184705fb14 Debug web service project 2016-04-08 21:50:31 +02:00
Ion Agorria
a5c5f9b10e New: Project WebServices 2016-04-07 22:08:50 +02:00
Frédéric FRANCE
f341c7fedd Avoid errors with bad parameters 2016-01-27 23:09:05 +01:00
philippe grand
5e3c89fdbd [Qual] Uniformize code 2015-12-21 22:59:12 +01:00
Laurent Destailleur
3b595f0247 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/core/lib/date.lib.php
	htdocs/core/lib/report.lib.php
	htdocs/langs/en_US/accountancy.lang
 2015-12-13 16:23:33 +01:00
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
Laurent Destailleur
3c55479705 Restler #3544 2015-11-22 17:17:06 +01:00
Paris Liakos
298a671342 getListOfProductsOrServices() filters are broken 2015-11-13 20:25:12 +02:00
philippe grand
0e343ae3b2 syntax error 2015-10-08 09:34:02 +02:00
Raphaël Doursenaud
631ee83745 [Qual] Replaced deprecated print_fiche_titre() 2015-09-24 18:34:58 +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