2
0
forked from Wavyzz/dolibarr
Commit Graph

65 Commits

Author SHA1 Message Date
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
Regis Houssin
b50f9867e8 Fix: include security.lib.php by default 2011-09-06 07:41:14 +00:00
Regis Houssin
6d8584f5ca Fix: Use the source in the hash to avoid duplicates if the references are identical
Fix: Use sha1 + md5 for more security
2011-09-06 06:28:18 +00:00
Laurent Destailleur
a05578134a New: Can use "unique" url for each paypal payment page 2011-09-05 22:52:17 +00:00
Laurent Destailleur
1df3ef4783 Fix: Error message 2011-09-02 16:46:38 +00:00
Regis Houssin
27300fe898 Fix: remove obsolete tags (in progress) 2011-08-27 16:15:06 +00:00
Laurent Destailleur
2050fcfa13 Fix: Avoid errors into rpm packages 2011-08-03 01:32:42 +00:00
Laurent Destailleur
37ead2f97e Fix: Avoid errors into rpm packages 2011-07-31 23:19:04 +00:00
Laurent Destailleur
b706f6034f Fix: Avoid conflict with other payment modules functions
New: EMail topics can be forced by external modules
2011-07-13 16:55:25 +00:00
Regis Houssin
9428c5d6ae Works on enhancement of paypal module
New: add triggers for post treatment
New: possibility to add payment link to email
2011-06-17 10:30:23 +00:00
Regis Houssin
2b70e828fa Works on enhancement of paypal module
New: add triggers for post treatment
New: possibility to add payment link to email
2011-06-17 10:21:21 +00:00
Regis Houssin
1eccc31f36 Works on enhancement of paypal module
New: add triggers for post treatment
New: possibility to add payment link to email
2011-06-17 10:21:21 +00:00
Regis Houssin
3ccd8dae25 Todo: problem with triggers 2011-05-26 12:36:56 +00:00
Regis Houssin
b5340d57a2 Fix: move this to an external module in Doliforge 2011-05-26 10:16:10 +00:00
Regis Houssin
da1bd8ce5f Fix: move this to an external module in Doliforge 2011-05-26 06:17:17 +00:00
Regis Houssin
8d8fd9ba91 Works on paypal module
Fix: add multi status
2011-05-25 12:33:59 +00:00
Regis Houssin
cd08296965 Works on paypal module
New: add trigger for fee treatment
Todo: problem with global in the triggers
2011-05-24 20:20:24 +00:00
Regis Houssin
e77298321a Works on paypal module
Fix: replace ref_ext by ref_int
2011-05-24 09:50:51 +00:00