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
142,956 Commits 35 Branches 179 Tags 1.7 GiB
develop
Commit Graph

312 Commits

Author SHA1 Message Date
Laurent Destailleur
39ebaec064 Replace usage of $bc[$var] with class="oddeven" 2017-04-14 11:22:48 +02:00
Laurent Destailleur
996cb9d3f1 NEW Add function ajax_autoselect 2017-03-23 11:16:30 +01:00
Laurent Destailleur
16ce156631 Fix responsive design 2016-11-25 18:32:52 +01:00
Laurent Destailleur
133657a8c7 Uniformize code 2016-09-21 01:25:34 +02:00
Laurent Destailleur
f0a3a5ce02 NEW Mutualize mass action. So "Send by email" is also avavilable on 
orders.
 2016-07-25 21:50:41 +02:00
Laurent Destailleur
91caea5707 Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +01:00
Laurent Destailleur
630f5a632d Revert "Corrected non-static usages of Form::selectarray function" 
This reverts commit 87cd6e1e40.
 2016-03-25 15:34:37 +01:00
Marcos García de La Fuente
5a046125db Missing changes from previous commits 2016-03-20 14:24:49 +01:00
Marcos García de La Fuente
87cd6e1e40 Corrected non-static usages of Form::selectarray function 2016-03-20 14:15:17 +01:00
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
philippe grand
de0a13ae8f [Qual] Uniformize code 2015-12-12 10:59:02 +01:00
Frédéric FRANCE
ac04fdbd9a Update paypal.php 2015-12-10 16:49:55 +01:00
Frédéric FRANCE
9bb9e6b787 Update paypal.php 2015-12-10 16:29:35 +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
Raphaël Doursenaud
631ee83745 [Qual] Replaced deprecated print_fiche_titre() 2015-09-24 18:34:58 +02: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
Laurent Destailleur
5ead994955 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	ChangeLog
 2014-12-26 04:57:55 +01:00
Marcos García de La Fuente
9d82e16506 Resized PayPal logo 2014-12-25 19:17:52 +01:00
Marcos García de La Fuente
f735aa676e Fix: [ bug #1674 ] PayPal logo copyright issues 2014-12-25 19:16:25 +01: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
f096253a6d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-07-15 23:28:58 +02:00
Laurent Destailleur
0cb11a537d Fix: IP address of user was lost into paypal confirm email 2014-07-15 23:27:11 +02:00
Marcos García de La Fuente
ec661d0c6c Removed index.php and replaced them with blank index.html as it is more appropriate 2014-07-12 23:18:57 +02:00
Raphaël Doursenaud
c48c3a9d91 Qual: remove PHP closing tag (again) 
These were reintroduced by careless merge
 2014-05-26 13:51:25 +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
Marcos García de La Fuente
960bea2d39 Corrected admin page style of some modules 2014-03-11 12:02:44 +01: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
2c0a01fc8c Merge remote-tracking branch 'origin/3.4' into develop 2013-07-11 17:57:06 +02:00
Laurent Destailleur
aa628fb47a Fix help 2013-07-09 00:35:55 +02:00
Laurent Destailleur
696ad07871 LF 2013-06-26 16:45:42 +02:00
Laurent Destailleur
2d0a85d6f8 New: Add option to send email when paypal or paybox payment is done. 2013-06-25 13:19:44 +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
Marcos García
674034e648 Translated some strings in the code 2012-12-31 05:55:06 +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
382f1a54c3 Fix: add key generator in agenda xcal admin page 2012-10-24 12:18:40 +02:00
Regis Houssin
e19f8c54f1 Fix: strict mode hurricane 2012-09-15 10:01:35 +02:00
Marcos García
f3674317ec Removed parenthesis from all require and replaced with single quotes 2012-08-22 23:24:21 +02:00
Marcos García
706d79986c Removed parenthesis from all require_once and replaced with single quotes 2012-08-22 23:11:24 +02:00
Laurent Destailleur
d5060adf9d Fix: Error if curl not available 2012-07-06 11:35:03 +02:00
Regis Houssin
ed3439d8ee Fix: add test if curl is installed 2012-07-04 17:00:29 +02:00
Regis Houssin
6f1651309e Fix: global converting lines delimiter 2012-07-02 19:30:37 +02:00
Laurent Destailleur
a3216ee0c6 Fix: Checkstyle 2012-05-09 02:39:30 +02:00
Laurent Destailleur
dca1c715d4 Fix: Try a fix for the lost mainmenu session. 2012-04-20 22:52:57 +02:00
simnandez
a8b0493531 Fix: Sanitize data 2012-04-05 16:20:37 +01: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
Regis Houssin
dea1210c2d Fix: edit in place datepicker more stable 2011-10-28 19:31:42 +02:00
Regis Houssin
5fe088334c Qual: move ajax response in /core/ajax directory 2011-10-25 19:03:12 +02:00
Regis Houssin
63d60a33fc [task #216] Move lib in core directory 2011-10-24 11:25:54 +02:00
Regis Houssin
30c5f4b214 Move all core class in htdocs/core/class 2011-10-24 09:29:17 +02: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
Laurent Destailleur
aff43ea24f Fix: Removed warnings 2011-09-21 13:05:32 +00: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
Juanjo Menent
71c98d380a Qual: Uniformize code 2011-09-06 09:33:24 +00:00
Juanjo Menent
a63d402bc5 Qual: Uniformize code 2011-09-06 09:25:32 +00:00
Regis Houssin
b50f9867e8 Fix: include security.lib.php by default 2011-09-06 07:41:14 +00:00
Regis Houssin
7e8ec1688f Fix: more visible 2011-09-06 07:33:35 +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
5edd43a1f2 Fix: hash is already hash. 2011-09-02 17:11:10 +00:00
Laurent Destailleur
db079f35b0 Fix: Missing end of div 2011-09-02 16:44:50 +00:00
Laurent Destailleur
fc134e41ac Fix: hash is already hash. 2011-09-02 17:11:10 +00:00
Laurent Destailleur
917195adea Fix: Missing end of div 2011-09-02 16:44:50 +00:00
Laurent Destailleur
0cc4ab7261 Fix: hash is already hash. 2011-09-02 17:11:10 +00:00
Laurent Destailleur
07b84e432f Fix: Missing end of div 2011-09-02 16:44:50 +00:00
Laurent Destailleur
cbe0941715 Fix: hash is already hash. 2011-09-02 17:11:10 +00:00
Laurent Destailleur
599e11d049 Fix: Missing end of div 2011-09-02 16:44:50 +00:00
Laurent Destailleur
83f22a59f4 Fix: hash is already hash. 2011-09-02 17:11:10 +00:00
Laurent Destailleur
df157e705d Fix: Missing end of div 2011-09-02 16:44:50 +00:00
Laurent Destailleur
2e90db8a73 Fix: hash is already hash. 2011-09-02 17:11:10 +00:00
Juanjo Menent
70be3209b8 Qual: Uniformize code 2011-09-02 16:51:19 +00:00
Laurent Destailleur
08a71d1d02 New: Always use th for table head 2011-09-02 22:16:17 +00:00
Laurent Destailleur
6cbf5c6ae2 Fix: Missing end of div 2011-09-02 16:44:50 +00:00
Laurent Destailleur
6bdaa37611 Fix: hash is already hash. 2011-09-02 17:11:10 +00:00
Juanjo Menent
808f8607c5 Qual: Uniformize code 2011-09-02 16:51:19 +00:00
Laurent Destailleur
82d08001fe New: Always use th for table head 2011-09-02 22:16:17 +00:00
Laurent Destailleur
7eba962b9d Fix: Missing end of div 2011-09-02 16:44:50 +00:00
Laurent Destailleur
9667a7c15a Fix: hash is already hash. 2011-09-02 17:11:10 +00:00
Laurent Destailleur
1df3ef4783 Fix: Error message 2011-09-02 16:46:38 +00:00
Laurent Destailleur
91dd9c79a1 Fix: Missing end of div 2011-09-02 16:44:50 +00:00
Laurent Destailleur
9bdb1057e1 Fix: W3C 2011-08-31 15:30:56 +00:00
Regis Houssin
27300fe898 Fix: remove obsolete tags (in progress) 2011-08-27 16:15:06 +00:00
Regis Houssin
726d9581dd Fix: remove obsolete tags (in progress) 2011-08-27 14:24:16 +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
cc840ad66e Fix: Avoid errors into rpm packages 2011-07-31 21:24:20 +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
f7929e9ee0 New: add jquery method for random generation 2011-07-09 08:05:08 +00:00
Regis Houssin
7d05be543b Fix: regression 2011-07-08 18:08:27 +00:00
Regis Houssin
704993fbdf New: add Paypal IPN 
Todo: add translation
 2011-07-08 08:30:49 +00:00
Laurent Destailleur
47a41153ef Reduce size of key 2011-07-03 16:55:04 +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
8feaaeb8f4 Fix: add logo paypal for top menu 2011-05-26 12:48:35 +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
3ebd00e059 Works on paypal module 
Fix: override jquery function gotoToday
 2011-05-25 15:59:11 +00:00
Regis Houssin
9dadd7a967 Works on paypal module 
Fix: force to search in current day
 2011-05-25 15:19:13 +00:00
Regis Houssin
fc3e0b1077 Works on paypal module 
Fix: force to search in current day
 2011-05-25 15:18:19 +00:00
Regis Houssin
14c2ee5854 Works on paypal module 
Fix: force to credit card
 2011-05-25 14:01:42 +00:00
Laurent Destailleur
c7dfa3d8fc Doxygen 2011-05-25 13:03:24 +00:00
Regis Houssin
8d8fd9ba91 Works on paypal module 
Fix: add multi status
 2011-05-25 12:33:59 +00:00
Regis Houssin
4a8be94190 Works on paypal module 
Fix: problem with db begin
 2011-05-25 06:58:05 +00:00
Regis Houssin
ad05ce68a0 Works on paypal module 
New: possibility to use the price defined in paypal instead dolibarr price
 2011-05-25 06:49:39 +00:00
Regis Houssin
8f8da6b4f0 Works on paypal module 
New: possibility to use the price defined in paypal instead dolibarr price
 2011-05-25 06:06:55 +00:00
Regis Houssin
60ff4318d8 Works on paypal module 
Fix: replace ref_ext by ref_int
 2011-05-25 05:16:52 +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
be26c52243 Works on paypal module 
New: add trigger for fee treatment
 2011-05-24 17:28:58 +00:00
Regis Houssin
0b1248bffa Works on paypal module 
New: add trigger for fee treatment
 2011-05-24 16:48:33 +00:00
Regis Houssin
2663005150 Works on paypal module 
Fix: enable/disable create object
Fix: defined default bank account for paypal
 2011-05-24 16:31:54 +00:00
Regis Houssin
14cf987a35 Works on paypal module 
Fix: add prices and total
 2011-05-24 14:06:08 +00:00
Regis Houssin
e77298321a Works on paypal module 
Fix: replace ref_ext by ref_int
 2011-05-24 09:50:51 +00:00
Regis Houssin
df3625d498 Works on paypal module 
Fix: add linked objects
 2011-05-24 07:29:14 +00:00