Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
54,599 Commits 36 Branches 189 Tags
2c77a901b30b8a11f084f4460f240519630a0f36
Commit Graph

82 Commits

Author SHA1 Message Date
Laurent Destailleur
446a080c75 NEW Mutualize code to manage email substitution variables. Show 
available variables into page to edit email templates.
 2016-03-05 12:20:58 +01:00
Frédéric FRANCE
9e0817ac05 Update paypal.lib.php 2015-12-10 16:28:22 +01:00
Frédéric FRANCE
9d0f096e47 Update paypal.lib.php 2015-12-07 11:46:47 +01:00
frederic34
df3af6979e Translation in paypal lib 2015-10-31 21:43:59 +01:00
Laurent Destailleur
31465fe899 Fix several minor bugs 2015-08-31 12:13:23 +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
b508dce3ff Fix: jquery path 2015-07-06 16:48:10 +02:00
Regis Houssin
e58957e603 Fix: broken feature: Check the entity because He may be the same 
reference in several entities
 2015-07-03 08:18:32 +02:00
Laurent Destailleur
369d6915b8 Fix: PHPCS 2015-04-08 00:14:44 +02:00
Scrutinizer Auto-Fixer
918ed34364 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2015-04-07 00:45:30 +00:00
aspangaro
c4c69e191b Replace <center> tags 2014-11-25 20:13:43 +01:00
Laurent Destailleur
80e62697f0 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/compta/bank/treso.php
 2014-11-18 19:01:01 +01:00
Laurent Destailleur
1b24356e0f ssl option is set to CURL_SSLVERSION_TLSv1. 
Some site disabled ssl v1 to 3 (ex: paypal).
 2014-11-18 17:13:08 +01:00
Laurent Destailleur
97eec37f1c Uniformize code: property "nom" for thirdparty is aliased into "name" 
everywhere.
 2014-10-04 17:20:17 +02:00
Laurent Destailleur
0cb11a537d Fix: IP address of user was lost into paypal confirm email 2014-07-15 23:27:11 +02:00
Raphaël Doursenaud
f8f502d013 Removed closing php tag 
http://php.net/manual/en/language.basic-syntax.phptags.php
 2014-05-03 18:18:44 +02:00
Laurent Destailleur
adf55408a4 Fix: Bad parameter that duplicate info. 2013-12-07 03:23:14 +01:00
Laurent Destailleur
c41a955cbe Fix: Permissions on files 2013-08-06 00:36:04 +02:00
Laurent Destailleur
9fae9da6a1 Fix: proxy was not used everywhere, timeout was not set everywhere. 2013-06-07 20:09:15 +02:00
Laurent Destailleur
e5a945ba5b Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	ChangeLog
	htdocs/admin/propal.php
	htdocs/compta/journal/purchasesjournal.php
	htdocs/compta/journal/sellsjournal.php
	htdocs/core/class/conf.class.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/lib/files.lib.php
	htdocs/core/modules/mailings/contacts2.modules.php
	htdocs/langs/ca_ES/admin.lang
	htdocs/langs/en_US/admin.lang
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/public/demo/index.php
 2013-04-14 01:46:33 +02:00
Regis Houssin
f3bbfe375c Fix: for multicompany compatibility 2013-04-08 12:41:48 +02:00
Regis Houssin
cea2f047a2 Fix: for multicompany compatibility 2013-04-08 12:38:51 +02:00
Grand Philippe
b081589129 english language standardization 2013-02-25 09:52:24 +01:00
Laurent Destailleur
0e13b3872d Fix: Removed warnings 2013-01-19 14:32:37 +01:00
Laurent Destailleur
8d206fdfb0 Prepare move to other licence. For the moment all answers for licence 
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
 2013-01-16 15:36:08 +01:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Laurent Destailleur
0128cc36c8 Fix: url example 2012-12-12 01:57:52 +01:00
Laurent Destailleur
caf897cfa7 Clean code to help debug pb with payment methods. 2012-12-12 01:49:23 +01:00
Regis Houssin
00aa22e1d7 Fix: wrong EOL 2012-12-02 11:03:23 +01:00
Laurent Destailleur
4136c27516 RESTORE CODE WITH ID D2adaf7. The Merge daacf79 as lost more than 50 
commits !
 2012-12-01 15:45:05 +01:00
Regis Houssin
2d5368e135 Fix: converting line delimiters 2012-11-20 12:11:19 +01:00
Laurent Destailleur
19b7cc66d5 Qual: Remove hidden option so is not efficient and not used files. 
Qual: Uniformize code
 2012-11-17 11:48:51 +01:00
Regis Houssin
e19f8c54f1 Fix: strict mode hurricane 2012-09-15 10:01:35 +02:00
Regis Houssin
6f1651309e Fix: global converting lines delimiter 2012-07-02 19:30:37 +02:00
Laurent Destailleur
3383d314c9 Doxygen 2012-03-19 17:18:11 +01:00
Regis Houssin
640f2e4c22 Fix: add getApiError() method 2012-03-12 17:17:00 +01:00
Regis Houssin
fb09e188ff Fix: force to use sslv3 2012-03-07 13:39:05 +01:00
Regis Houssin
5d89d5d734 Fix: add warning message for sandbox mode 2012-02-16 11:52:38 +01:00
Laurent Destailleur
47c83603f4 Qual: normalize code 2012-01-22 20:33:45 +01:00
Laurent Destailleur
c2348ef600 Uniformize field country_id, country_code, country 2011-12-29 18:07:41 +01:00
Laurent Destailleur
53181aa0c1 Qual: Removed useless calls 
Doxygen
 2011-12-07 17:28:11 +01:00
Laurent Destailleur
b52fc32853 Fix: fix not initialized variables 2011-12-05 19:41:38 +01:00
Laurent Destailleur
70ab87c210 Qual: Mutualize link to paypal 2011-11-30 19:42:08 +01:00
Laurent Destailleur
f3191e0979 New: Add product desc into paypal payment page 2011-11-30 18:48:04 +01:00
Laurent Destailleur
3a33ffaa71 Fix: Correct order of log fields 2011-11-30 15:13:41 +01:00
Laurent Destailleur
839781dfbe Qual: Removed a TODO by renaming all ->monnaie into ->currency 2011-11-23 14:55:36 +01:00
eldy
c05ad3b4da Doxygen 2011-10-03 18:10:50 +02:00
eldy
346d8880df Fix: Files must be utf8 with no BOM 2011-09-29 20:06:14 +02:00
Regis Houssin
551e1f81bf Fix: Space after closing parenthesis of function call prohibited 2011-09-20 13:32:16 +00:00
Regis Houssin
b6a2f13673 Fix: avoid jenkins warning 
Fix: SpaceAfterOpenBracket, SpaceAfterCloseBracket, SpaceBeforeCloseBracket, SpaceBeforeOpenBracket
 2011-09-20 09:40:27 +00:00