Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 09:38:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
49,784 Commits 36 Branches 190 Tags
039039bb0078007af2495f1655956afb51a4ac05
Commit Graph

642 Commits

Author SHA1 Message Date
Laurent Destailleur
298396a57e Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	test/phpunit/AllTests.php
 2015-12-19 01:27:19 +01:00
Laurent Destailleur
a136e90749 Fix travis 2015-12-19 01:06:11 +01:00
Laurent Destailleur
41cdb65521 Test to solve travis error 2015-12-18 21:44:18 +01:00
Laurent Destailleur
4b741c6b9c Fix permissions 2015-12-13 16:16:30 +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
25e729cf4d Revert "Fix #3322 Use title for alt if no alt is provided" 
This reverts commit 2cf9d9f583.
 2015-08-12 23:18:07 +02:00
Juanjo Menent
761c50a885 Merge remote-tracking branch 'origin/3.7' into 3.8 2015-08-06 18:22:29 +02:00
Raphaël Doursenaud
2cf9d9f583 Fix #3322 Use title for alt if no alt is provided 
alt has priority over title, so it should be filled if title is filled.
Use the title value to fill alt.
Unit test updated accordingly.
 2015-08-03 10:30:10 +02:00
Arnaud Aujon
ed657d2bdf hopefully fix travis errors 2015-06-01 20:39:51 +02:00
Arnaud Aujon
9bd32d7bf6 Merge remote-tracking branch 'upstream/develop' into 3.7-webservices-fix 2015-06-01 20:10:51 +02:00
Arnaud Aujon
3099e2acc4 fix travis issues again 2015-06-01 14:15:09 +02:00
Arnaud Aujon
0c66c9745e fix travis error 2015-06-01 13:04:33 +02:00
Laurent Destailleur
65c7ab7a93 Fix: Introduce error by default when function is used as a true delete 
function.
 2015-05-29 17:11:42 +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
336b8c49b3 update test 2015-05-27 15:42:46 +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
Arnaud Aujon
2db885a2b3 first attempt to add test 2015-05-11 13:51:57 +02:00
jfefe
0d14cb8709 Modify thirdparty delete() method to pass user object as an argument. 2015-05-03 18:44:42 +02:00
Laurent Destailleur
a0c27620b2 Fix to match spanish new vat value 2015-04-26 18:28:08 +02:00
Laurent Destailleur
1abcd5f4fe Fix test for vat calculation 2015-04-26 16:58:00 +02:00
Laurent Destailleur
4235d74aac Fix tests for ES 2015-04-26 16:45:24 +02:00
Juanjo Menent
3d08280026 Fix test for es. testGetDefaultLocalTax 2015-04-23 10:35:08 +02:00
Juanjo Menent
e2635f66f5 Fix test for es 2015-04-22 22:10:50 +02:00
Laurent Destailleur
6b15cafb4e Add protection to request some module to be on for AllTests 2015-04-22 21:38:34 +02:00
Laurent Destailleur
208ac31bf8 Fix test for es 2015-04-22 17:39:09 +02:00
Juanjo Menent
ad31f0110a Improve PHPUnit Prices test for Spanish localtax1 and localtax2 2015-04-21 22:01:53 +02:00
Laurent Destailleur
f06255e9d2 Complete the mailmap file. 2015-04-21 16:57:45 +02:00
Laurent Destailleur
22921ad26b Fix phpunit 2015-04-19 04:43:28 +02:00
Laurent Destailleur
72845b21c7 Add log 2015-04-19 04:01:31 +02:00
Laurent Destailleur
6db76830fd Fix load module by test 2015-04-19 03:36:27 +02:00
Laurent Destailleur
e508b28d74 Fix doliforge bug 1707 2015-04-15 18:53:39 +02:00
Laurent Destailleur
bf254baa02 Fix doliforge bug 1707 2015-04-15 18:50:41 +02:00
Laurent Destailleur
ae103e34b8 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	build/debian/changelog
	htdocs/compta/facture.php
	htdocs/core/lib/price.lib.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/opensurvey/public/studs.php
	htdocs/projet/element.php
 2015-04-13 13:08:46 +02:00
Laurent Destailleur
6889162d7a Fix: management of vat type 2, 4 and 6 is now ok. 
Works for canada and ivory cost.
 2015-04-11 22:51:53 +02:00
Laurent Destailleur
f40bb3e6aa fix phpcs 2015-04-06 11:05:16 +02:00
Laurent Destailleur
678e55f9da We must add a viewport meta to have font visible on mobile 2015-04-04 04:11:54 +02:00
Laurent Destailleur
747c780f67 Enhance phpunit tests 2015-04-04 02:44:42 +02:00
Laurent Destailleur
9f5ba746a1 Update phpunit tests 2015-04-04 00:51:00 +02:00
Laurent Destailleur
8e9c1c4747 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/list.php
	htdocs/core/class/notify.class.php
	htdocs/core/login/functions_dolibarr.php
	htdocs/exports/export.php
	htdocs/langs/en_US/admin.lang
 2015-04-01 16:33:39 +02:00
Laurent Destailleur
42c2c81e28 Fix detection of html was wrong with img 2015-03-26 12:05:52 +01:00
Laurent Destailleur
a55af4387b Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	.travis.yml
	htdocs/core/class/notify.class.php
	htdocs/product/stock/class/mouvementstock.class.php
	test/phpunit/AllTests.php
	test/phpunit/MouvementStockTest.php
 2015-03-22 12:10:39 +01:00
Laurent Destailleur
c9b569ad1a Fix calculation of PMP of product. 
Also add phpunit test to avoid this in future.
 2015-03-21 15:31:11 +01:00
Laurent Destailleur
4f9aef6150 Fix calculation of PMP of product. 
Also add phpunit test to avoid this in future.
 2015-03-21 15:29:23 +01:00
Laurent Destailleur
435be30047 Clean code 2015-03-17 00:35:17 +01:00
Laurent Destailleur
5335a6affa NEW: Add close date and user for projects. 2015-03-04 16:28:29 +01:00
Marcos García de La Fuente
8dffe2a910 Corrected FunctionsLibTest:testGetBrowserInfo 2015-02-28 19:33:19 +01:00
Marcos García de La Fuente
60e2524fc2 Merge remote-tracking branch 'upstream/develop' into better-practice 
Conflicts:
	htdocs/core/lib/functions.lib.php
	test/phpunit/FunctionsLibTest.php
 2015-02-28 14:39:14 +01:00