Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
133,486 Commits 35 Branches 179 Tags 1.7 GiB
5bde94de4f
Commit Graph

161 Commits

Author SHA1 Message Date
Laurent Destailleur
f5a7275077 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/takepos/index.php
 2021-11-11 18:34:04 +01:00
Laurent Destailleur
e22bd5c048 Fix better format address for jp in romaji 2021-09-02 10:39:56 +02:00
Laurent Destailleur
526235d020 Fix substitution of mix html/nohtml 
Fix send email reminder for past due date of invoices
More PHPUnit test
 2021-05-04 13:33:18 +02:00
Laurent Destailleur
5f8b52ffc9 Code comment 2021-03-03 12:05:43 +01:00
Frédéric FRANCE
398048da04
fix tests 2021-02-21 16:10:35 +01:00
Frédéric FRANCE
9ef56b53f2
fix tests 2021-02-21 16:05:59 +01:00
Frédéric FRANCE
5ceb8163de
fix tests 2021-02-21 15:40:03 +01:00
Frédéric FRANCE
6e3a1a1d41
fix tests 2021-02-21 13:32:54 +01:00
Frédéric FRANCE
b1a1cd4be6
code syntax 2021-01-14 15:09:08 +01:00
Laurent Destailleur
7b93c34c0f Fix phpunits 2020-12-29 03:48:11 +01:00
Laurent Destailleur
10bef6eb03 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/opensurvey/class/opensurveysondage.class.php
	htdocs/product/class/product.class.php
	htdocs/supplier_proposal/card.php
 2020-12-04 19:24:29 +01:00
Laurent Destailleur
49db52134b Fix for negative numbers 2020-12-04 18:19:51 +01:00
Laurent Destailleur
7634212811 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/system/phpinfo.php
	htdocs/commande/stats/index.php
	htdocs/compta/facture/stats/index.php
 2020-11-29 21:35:03 +01:00
Laurent Destailleur
d3a2aa664f FIX #15572 2020-11-29 20:27:40 +01:00
Laurent Destailleur
574919de52 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.travis.yml
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/adherents/class/subscription.class.php
	htdocs/compta/bank/categ.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/boxes/box_task.php
	htdocs/core/class/commondocgenerator.class.php
	htdocs/core/class/interfaces.class.php
	htdocs/core/lib/project.lib.php
	htdocs/core/modules/modCategorie.class.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/fichinter/class/fichinterrec.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/install/repair.php
	htdocs/main.inc.php
	htdocs/product/price.php
	htdocs/projet/tasks/time.php
	htdocs/reception/card.php
 2020-11-27 15:45:12 +01:00
Laurent Destailleur
ac3c129735 Clean code 2020-11-27 14:24:15 +01:00
Laurent Destailleur
81566289cd Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/class/commande.class.php
 2020-11-24 11:07:35 +01:00
Laurent Destailleur
53208e620e Use of . as thousand separator. Can use it for decimal if not 3 digits. 2020-11-24 10:56:05 +01:00
Laurent Destailleur
1e70790cd6 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/price.php
 2020-11-23 19:55:13 +01:00
Laurent Destailleur
c5278197fb More phpunit test for price2num 2020-11-23 19:45:11 +01:00
Laurent Destailleur
e8ea7125e5 Removed the FIXME. The dol_getdate can now use a timezone. 2020-10-14 17:11:22 +02:00
Laurent Destailleur
5744b1e0a3 Fix #yogosha4512 2020-09-17 21:34:31 +02:00
Laurent Destailleur
4d6a45d491 Major doxygen fix 2020-05-03 22:48:35 +02:00
Laurent Destailleur
05e08b3596 FIX Filenames must not contains non ascii char or we will get non ascii 
char into the SMTP header.
FIX Do not encode subject if it is full ascii (not required)
 2020-02-06 12:58:02 +01:00
Laurent Destailleur
330cca994e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2019-12-23 15:49:00 +01:00
Laurent Destailleur
3250b13f4a FIX dol_string_nohtmltag when there is html with windows EOL "<br>\r\n" 2019-12-23 15:45:08 +01:00
Laurent Destailleur
6ec36ab04e Fix phpunit 2019-10-02 20:36:57 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Laurent Destailleur
529c2f4992 Fix phpcs 2019-08-27 17:54:51 +02:00
Laurent Destailleur
36c936357c Add phpunit testDolStringIsGoodIso 2019-08-27 12:25:24 +02:00
Frédéric FRANCE
42a1387218
wip 2019-02-25 00:56:48 +01:00
Frédéric FRANCE
24b073771e
wip 2019-01-27 13:07:22 +01:00
Laurent Destailleur
5e9abe6aad Fix getLanguageCodeFromCountryCode 2018-11-21 16:28:36 +01:00
Laurent Destailleur
3d3edb19d8 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.travis.yml
	htdocs/langs/en_US/commercial.lang
 2018-09-02 15:48:26 +02:00
Laurent Destailleur
76d6affb27 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	.travis.yml
 2018-09-02 15:46:09 +02:00
Laurent Destailleur
a7dfc88b59 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	test/phpunit/CoreTest.php
 2018-09-02 15:21:21 +02:00
Laurent Destailleur
bd3647a9d7 Prepare phpunit 6.1 compatibility 2018-09-02 14:23:52 +02:00
Laurent Destailleur
02bedc49d3 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	test/phpunit/PricesTest.php
	test/phpunit/RestAPIUserTest.php
	test/phpunit/WebservicesInvoicesTest.php
 2018-09-02 14:15:17 +02:00
Laurent Destailleur
a69c3caf2c Prepare compatibility with phpunit 6.1 2018-09-02 14:10:06 +02:00
Frédéric FRANCE
6aee680a4f
PSR2 ClassDeclaration 2018-08-29 22:06:05 +02:00
Frédéric FRANCE
b03f4004ea
PSR2 FunctionClosingBrace 2018-08-29 21:25:22 +02:00
Frédéric FRANCE
54a078149a
function declaration 2018-08-15 17:34:35 +02:00
Laurent Destailleur
91b7ee5fc2 NEW Add function isValidMXRecord 2018-07-04 11:07:28 +02:00
Laurent Destailleur
956fc2376d FIX #8483 2018-04-06 12:27:55 +02:00
Laurent Destailleur
5d6d019fe7 Fix phpunit 2018-04-06 00:21:40 +02:00
Laurent Destailleur
48ff89c63b Fix regression 2018-04-05 19:52:54 +02:00
Laurent Destailleur
b210360220 More test 2018-04-05 12:59:01 +02:00
Laurent Destailleur
04ca623ced More tests 2018-03-25 13:12:14 +02:00
Laurent Destailleur
0b470bef80 Add phpunit for make_substitutions 2017-11-26 10:24:33 +01:00
Laurent Destailleur
53d2f29cdd Fix regression 2017-10-23 10:27:50 +02:00
Laurent Destailleur
cb4d863e83 Fix phpunit 2017-10-22 04:34:28 +02:00
Laurent Destailleur
e25a428118 Fix compatibility with Internet Explorer 2017-08-23 12:32:28 +02:00
Laurent Destailleur
25b107defb Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/contrat/list.php
	htdocs/fichinter/list.php
 2017-07-23 19:09:00 +02:00
Laurent Destailleur
44023606c6 Fix pb in dolGetFirstLineOfText. Add PHPunit 2017-07-22 12:47:35 +02:00
Laurent Destailleur
252d8da8fc Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/categories/class/categorie.class.php
	htdocs/core/class/commondocgenerator.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/filefunc.inc.php
	htdocs/societe/class/societe.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2017-07-07 15:11:53 +02:00
Laurent Destailleur
b308cfef1d Fix dol_trunc 2017-06-30 18:30:01 +02:00
Laurent Destailleur
145cb628cd FIX dol_string_nohtmltag make 2 passes to clean html into html 
attributes.
 2017-05-31 11:11:25 +02:00
Laurent Destailleur
ef9cf6ef52 Add test on phpunit 2017-05-21 23:54:37 +02:00
Laurent Destailleur
65be3107c3 Fix phpunit 2017-04-01 00:51:16 +02:00
Laurent Destailleur
cb0eb26faa Fix phpunit 2017-03-23 20:37:04 +01:00
Laurent Destailleur
4768017662 Debug of module accountancy 2016-11-16 19:23:32 +01:00
Laurent Destailleur
a658b7cc3d Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/comm/card.php
 2016-10-31 21:31:57 +01:00
Laurent Destailleur
3882fa0c3d Fix dol_buildpath with parameter 3. Add phpunit tests 2016-10-31 10:37:58 +01:00
Laurent Destailleur
a353093ae7 NEW Phone formatting for Canada. Add dol_print_phone into phpunit tests 2016-08-01 20:18:31 +02:00
Laurent Destailleur
b615b52f47 FIX html detection fails if only u tag is present 2016-07-26 16:11:38 +02:00
Laurent Destailleur
a67f52e491 Fix php unit to work both with old and new setup 2016-02-02 13:00:30 +01:00
Laurent Destailleur
4b741c6b9c Fix permissions 2015-12-13 16:16:30 +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
Laurent Destailleur
a0c27620b2 Fix to match spanish new vat value 2015-04-26 18:28:08 +02:00
Juanjo Menent
3d08280026 Fix test for es. testGetDefaultLocalTax 2015-04-23 10:35:08 +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
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
Marcos García de La Fuente
8dffe2a910 Corrected FunctionsLibTest:testGetBrowserInfo 2015-02-28 19:33:19 +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
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
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
frederic34
73fda2cb86 WIP PSR2 2015-01-08 18:36:03 +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
5fdd798e91 Fix: phpcheckstyle from phpcs 1.5.5 (closing tags and & char on 
parameter).
 2014-09-27 17:13:15 +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
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
Laurent Destailleur
36c4d272e7 Fix: phpunit test 2014-07-30 08:45:10 +02:00
Marcos García de La Fuente
76725c61ed Created test for dol_nl2br 2014-07-22 04:10:42 +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
ccca46f380 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/propal.php
	htdocs/comm/propal/list.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/lib/functions.lib.php
	htdocs/expedition/note.php
	htdocs/fourn/commande/liste.php
	htdocs/fourn/facture/fiche.php
	htdocs/main.inc.php
	htdocs/projet/tasks/index.php
	htdocs/theme/eldy/style.css.php
 2014-05-29 19:20:48 +02:00