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

660 Commits

Author SHA1 Message Date
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
Marcos García de La Fuente
ceec3e926e Typo 2015-02-25 16:47:34 +01:00
Marcos García de La Fuente
f598963d6b Fixed regression 2015-02-25 16:41:51 +01:00
Laurent Destailleur
6d3834b3b9 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/index.php
	htdocs/projet/class/project.class.php
	test/phpunit/BankAccountTest.php
 2015-02-23 14:59:24 +01:00
Marcos García de La Fuente
abda67adc2 Improved testGetBrowserInfo 2015-02-23 10:45:22 +01:00
Marcos García de La Fuente
71b98ee82b Safari can appear in iPad, iPod, iPhone and future Apple products, it is not fair to attach it to one of them. 2015-02-23 10:42:10 +01:00
Marcos García de La Fuente
102d2d9d36 Added IE11 test to testGetBrowserInfo 2015-02-23 10:39:02 +01:00
Marcos García de La Fuente
ce916f3bcb Better practice in getBrowserInfo 2015-02-22 12:35:51 +01:00
Laurent Destailleur
938936b8f2 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/core/lib/agenda.lib.php
	htdocs/core/lib/functions.lib.php
 2015-02-20 22:51:47 +01:00
Laurent Destailleur
bd6b465ee1 Add phpunit for ie11 and ie10 2015-02-20 20:16:15 +01:00
Laurent Destailleur
9e078b32d2 Fixes the way the RUM number is generated. Start phpunit test. 2015-02-20 18:35:52 +01:00
Laurent Destailleur
2a9ba93712 Update test of module inits 2015-02-14 12:32:22 +01:00
Laurent Destailleur
01541e4152 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/core/datepicker.php
 2015-02-03 12:17:45 +01:00
Laurent Destailleur
20121c2fbe Fix pb into date management. 
Added phpunit to avoid this in future.
 2015-02-03 11:25:51 +01:00
Laurent Destailleur
4fdc287717 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/accountancy/customer/card.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/admin/menus.php
	htdocs/fourn/commande/card.php
	htdocs/install/check.php
 2015-01-30 15:53:06 +01:00
Laurent Destailleur
3ebaaa38d2 Fixed: Management of option SERVICE_ARE_ECOMMERCE_200238EC 2015-01-25 16:04:37 +01:00
Laurent Destailleur
fdaa930507 Solve phpunit. 
Fix database field format
 2015-01-19 01:58:48 +01:00
Laurent Destailleur
f96fdc7d0a Regression solved 2015-01-18 21:04:39 +01:00
Laurent Destailleur
c54355b63a Merge remote-tracking branch 'origin/3.7' into develop 2015-01-16 10:44:41 +01:00
Laurent Destailleur
d16ce7eb96 Fix: Bad var 2015-01-15 02:42:41 +01:00
Laurent Destailleur
a886136e67 More comment and add a unit test to check that {t} tag is correctly 
supported.
 2015-01-13 22:13:15 +01:00
Laurent Destailleur
31fd03790e Fixed: Prices visible into stock tab. 
Conflicts:
	htdocs/product/stock/product.php
 2015-01-12 18:26:11 +01:00
Laurent Destailleur
1d2c8bbd4d Fixed: Prices visible into stock tab. 2015-01-12 18:16:24 +01:00
Laurent Destailleur
fc78d632d3 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/functions.lib.php
	htdocs/main.inc.php
 2015-01-09 23:09:10 +01:00
frederic34
73fda2cb86 WIP PSR2 2015-01-08 18:36:03 +01:00
Laurent Destailleur
c0b5b9f00b Fixed: Removed deprecated function 2015-01-04 19:26:51 +01:00
Laurent Destailleur
e395fd8096 Fix CRLF 2014-11-30 15:24:39 +01:00
Laurent Destailleur
491aef72e0 More phpunit tests 2014-11-28 00:56:21 +01:00
Laurent Destailleur
f7552c83d2 Fix: Must ignore such fields 2014-10-30 17:50:34 +01:00
Laurent Destailleur
13590a876b Fix: A little clean of dol_hash usage. 2014-10-18 16:08:15 +02:00
Laurent Destailleur
f498921715 Merge branch 'droposcommerce' of github.com:GPCsolutions/dolibarr into 
GPCsolutions-droposcommerce

Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/vi_VN/admin.lang
	htdocs/langs/vi_VN/shop.lang
 2014-10-13 00:50:51 +02:00
Laurent Destailleur
591b40e674 Some fix with export definition. Works now with pgql too. 2014-10-12 01:59:21 +02:00
Laurent Destailleur
a804fe62b4 Fix: translation for vi_VN 2014-10-11 15:46:37 +02:00
Laurent Destailleur
97eec37f1c Uniformize code: property "nom" for thirdparty is aliased into "name" 
everywhere.
 2014-10-04 17:20:17 +02:00
Raphaël Doursenaud
f01e76f686 Removed unmaintaned OScommerce module 2014-09-29 15:22:48 +02:00
Regis Houssin
f1f4fc18e9 Fix: use "doc" instead "pdf" dir and uniformize code 2014-09-29 11:08:50 +02:00
Laurent Destailleur
14ab409ca9 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/admin/stock.php
	htdocs/admin/system/index.php
	htdocs/comm/fiche.php
	htdocs/core/lib/admin.lib.php
	htdocs/core/lib/holiday.lib.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/login/functions_forceuser.php
	htdocs/core/login/functions_http.php
	htdocs/core/menus/standard/auguria.lib.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/filefunc.inc.php
	htdocs/holiday/define_holiday.php
	htdocs/opensurvey/fonctions.php
	htdocs/societe/canvas/actions_card_common.class.php
	test/phpunit/CompanyBankAccountTest.php
	test/phpunit/ExportTest.php
	test/phpunit/FactureTest.php
	test/phpunit/FunctionsLibTest.php
	test/phpunit/PropalTest.php
	test/phpunit/SocieteTest.php
	test/phpunit/WebservicesInvoicesTest.php
	test/phpunit/WebservicesThirdpartyTest.php
 2014-09-28 02:14:32 +02:00
Laurent Destailleur
5fdd798e91 Fix: phpcheckstyle from phpcs 1.5.5 (closing tags and & char on 
parameter).
 2014-09-27 17:13:15 +02:00
Laurent Destailleur
e8b7c9c6bd Fix: doxygen 2014-09-27 16:00:11 +02:00
Laurent Destailleur
dad82fa1fa Fix: bad phpunit test case 2014-09-24 01:36:12 +02:00
Laurent Destailleur
dc96e10215 Merge branch 'oop-pdf' of github.com:marcosgdf/dolibarr into 
marcosgdf-oop-pdf

Conflicts:
	htdocs/projet/class/project.class.php
 2014-09-23 00:02:19 +02:00
Laurent Destailleur
d0da5ef047 Merge pull request #1910 from FHenry/develop 
Better accountancy auto find accountancy code feature (work with several
 2014-09-22 23:48:32 +02:00
aspangaro
9220419409 Merge remote-tracking branch 'Upstream/develop' into develop 2014-09-21 20:45:41 +02:00
Laurent Destailleur
cec7464410 Fix: case into phpunit test case 2014-09-21 20:13:38 +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
Florian HENRY
3602155c5e Fix FicheInterTest Call 2014-09-20 10:28:59 +02:00
aspangaro
1592968709 Merge remote-tracking branch 'Upstream/develop' into develop 2014-09-20 06:42:31 +02:00
Laurent Destailleur
b252680346 Add phpunit for interventions 2014-09-20 01:10:55 +02:00
Laurent Destailleur
ad8b92541d Fix: sql request with pgsql 
Fix: bug reported by scrutinizer
Doxygen
Start to work on multi user assigned to an event.
 2014-09-20 00:57:29 +02:00
aspangaro
0b20369dd7 Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00
Marcos García de La Fuente
9ae7486555 Removed deprecated usage of supplier_order_pdf_create and supplier_invoice_pdf_create 2014-09-16 21:42:07 +02:00
Marcos García de La Fuente
3561c8e6f3 Removed deprecated usage of propale_pdf_create 2014-09-16 20:57:17 +02:00
Marcos García de La Fuente
9dbf054026 Removed deprecated usage of project_pdf_create 2014-09-16 20:53:43 +02:00
Marcos García de La Fuente
4b3191b64e Removed deprecated usage of facture_pdf_create 2014-09-16 20:49:05 +02:00
Marcos García de La Fuente
610dc8cd0c Removed deprecated usage of expedition_pdf_create 2014-09-16 20:38:28 +02:00
Marcos García de La Fuente
c195c6fd10 Removed deprecated usage of commande_pdf_create 2014-09-16 20:35:31 +02:00
Laurent Destailleur
342e26f679 Merge 2014-09-07 12:22:04 +02:00
Laurent Destailleur
6d9cc15856 Fix: Function unaccent was not enough complete. 2014-09-06 14:40:43 +02:00
Laurent Destailleur
e3f96802fb Fix: sql bad use. 
Qual: Incrase sql syntax test by phpunit to migration scripts. 
Qual: Removed old migration script before 3.0.0
 2014-08-14 00:09:09 +02:00
Laurent Destailleur
35d2e4f84c Merge remote-tracking branch 'origin/3.6' into develop 2014-08-06 10:30:58 +02:00
Laurent Destailleur
230b1d4bb8 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	test/phpunit/SqlTest.php
 2014-08-06 10:28:37 +02:00
Laurent Destailleur
a430534768 Merge remote-tracking branch 'origin/3.4' into 3.5 2014-08-06 10:22:34 +02:00
Laurent Destailleur
96a4aa2d26 Fix: phpunit 2014-08-01 01:31:52 +02:00
Laurent Destailleur
8e5cbb1f6c Merge branch 'patch-2' of github.com:marcosgdf/dolibarr into 
marcosgdf-patch-2

Conflicts:
	test/phpunit/Functions2LibTest.php
 2014-07-31 17:21:46 +02:00
Marcos García de La Fuente
972d3c69b6 Removed duplicated requires. 
Json.lib.php is included with functions.lib.php
 2014-07-30 15:42:58 +02:00
Marcos García de La Fuente
42c7fc1c8d Revert "Testing dol_json_encode is not interesting now as it uses a core function" 2014-07-30 15:19:31 +02:00
Laurent Destailleur
36c4d272e7 Fix: phpunit test 2014-07-30 08:45:10 +02:00
Marcos García de La Fuente
5baf48fc15 Revert "Removed empty test" 
This reverts commit cf1a2c44a3.
 2014-07-26 19:12:11 +02:00
Laurent Destailleur
3b9cfea8c9 Better function is_ip 2014-07-26 14:16:09 +02:00
Laurent Destailleur
8f6023ab5f Fix: phpunit test 2014-07-26 14:07:37 +02:00
Marcos García de La Fuente
76725c61ed Created test for dol_nl2br 2014-07-22 04:10:42 +02:00
Laurent Destailleur
dec7fe42af Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/fourn/commande/fiche.php
 2014-07-20 15:37:50 +02:00
Laurent Destailleur
cfc337a79a Qual: Enable php checkstyle rule Zend.Files.ClosingTag 
Fix: Solve a lot of checkstyle errors.
 2014-07-20 15:27:38 +02:00
Laurent Destailleur
4f173d095c Qual: Add php unit for function is_ip 2014-07-20 13:32:06 +02:00
Marcos García de La Fuente
a6275181ec Corrected testIsValidUrl 2014-07-20 10:20:05 +02:00
Marcos García de La Fuente
cf1a2c44a3 Removed empty test 2014-07-20 08:33:56 +02:00
Laurent Destailleur
7a8f244ae9 Fix: Translation 2014-07-19 16:03:55 +02:00
Marcos García de La Fuente
3e160fb209 Testing dol_json_encode is not interesting now as it uses a core function 2014-07-18 12:05:03 +02:00
Marcos García de La Fuente
a3ceb2a970 Added a test for isValidUrl function 2014-07-18 12:01:19 +02:00
Marcos García de La Fuente
0c4a3b23af Corrected test 2014-07-18 03:52:30 +02:00
Laurent Destailleur
a137b31a47 Fix: ON DELETE CASCADE is forbidden. 
Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	test/phpunit/SqlTest.php
 2014-07-08 21:50:29 +02:00
Laurent Destailleur
9b6b5feb4f Fix: ON DELETE CASCADE is forbidden. 2014-07-08 21:38:20 +02:00
Laurent Destailleur
932206a152 Fix: phpunit 2014-07-08 21:04:17 +02:00