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

558 Commits

Author SHA1 Message Date
Laurent Destailleur
7f3a06127a Fix: Bad regex 2013-06-24 19:55:23 +02:00
Regis Houssin
4cd6ae6bbd Fix: convert lines delimiters 2013-06-24 17:36:33 +02:00
Regis Houssin
05bd035488 Fix: convert line delimiters 2013-06-24 17:34:22 +02:00
Laurent Destailleur
ec2e3db450 New: Switch cron module to status stable. Thanks to everybody to test 
this new module and debug it.
 2013-06-23 22:21:21 +02:00
Grand Philippe
b599481ef6 standardize code 2013-06-20 09:18:12 +02:00
Laurent Destailleur
7d2f904174 Fix: Option MEMBER_PAYONLINE_SENDEMAIL was not working 2013-06-09 12:47:44 +02:00
Regis Houssin
c9a71439b2 Fix: EOF 2013-06-05 16:24:32 +02:00
Laurent Destailleur
eadfa66f2c Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/core/class/infobox.class.php
 2013-06-04 22:59:28 +02:00
Laurent Destailleur
b1a280de32 Fix: error message 2013-06-03 23:11:36 +02:00
Laurent Destailleur
8fe45b1af6 Manifest usage is useless for a dynamic application like dolibarr. 2013-05-21 14:41:11 +02:00
Laurent Destailleur
9a4cc839bb Fix: Removed warning 
Fix: Parameters are lost
Fix: Hedaer of demo no complete
Fix: Get of country is not complete (bad label)
 2013-05-02 17:41:10 +02:00
fhenry
91885a8bd4 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-04-26 20:54:53 +02:00
Laurent Destailleur
2a74cb81f0 Fix: Removed warnings 2013-04-26 19:13:39 +02:00
fhenry
b9f7d4c302 Fix bug on invoice extrafield type date 2013-04-26 12:20:15 +02:00
fhenry
a06581771c Reveiw extrafield for womplaiance with wiki 
http://wiki.dolibarr.org/index.php/Extrafields
 2013-04-26 10:29:14 +02:00
Laurent Destailleur
4e0ef01389 Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap 2013-04-25 01:13:13 +02:00
Laurent Destailleur
56a0f70ad3 Fix: margin disabled into demo for foundation 2013-04-19 10:33:25 +02:00
Laurent Destailleur
a4073dddd4 Doxygen llxHeader and llxFooter. 2013-04-15 15:43:25 +02:00
Laurent Destailleur
0e073038ad Fix: Check on correct security key 2013-04-14 20:59:16 +02:00
Laurent Destailleur
f028cce39d Qual: More log 2013-04-14 20:43:38 +02:00
Laurent Destailleur
de9f100968 Fix: check read feature 2013-04-14 20:34:31 +02:00
Laurent Destailleur
3cec5bfc40 doxygen 2013-04-14 11:22:00 +02:00
Laurent Destailleur
b86eba7f34 doxygen 2013-04-14 10:50:33 +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
fhenry
2440513007 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/opensurvey/fonctions.php
	htdocs/opensurvey/public/choix_date.php
	htdocs/opensurvey/public/create_survey.php
	htdocs/opensurvey/public/exportcsv.php
	htdocs/public/paybox/paymentko.php

Change-Id: I57468f3a0f6bb1115bd48b84517060432102c2ea
 2013-04-11 10:04:27 +02:00
Laurent Destailleur
76c180aaaf Fix: encoding at wrong place 2013-04-10 23:13:55 +02:00
Laurent Destailleur
d570aa02d4 Fix: bad url 2013-04-10 23:11:21 +02:00
Laurent Destailleur
3bcd506e73 Fix: demo modules list 2013-04-10 23:06:38 +02:00
fhenry
98ddd02a32 Qual : PHP Code_Sniffer 2013-04-10 19:55:21 +02:00
Laurent Destailleur
ba93a4bfe2 Fix: Codesniffer 2013-04-10 12:20:45 +02:00
Laurent Destailleur
25ec7eed6d New: Can send email to warn when payment for subscription is payed. 2013-04-06 16:14:28 +02:00
Laurent Destailleur
89365786a8 New: enhance tool fixdosfiles.sh 
Convert DOS files to unix
 2013-03-30 14:27:13 +01:00
Laurent Destailleur
c3589e9785 Some debug into cron module: 
- Because cron is a module, constant must start with CRON_.
- Miscellanous fixes.
- For external link to run jobs from url, we must forge url using conf
file and not autodetect url.
 2013-03-23 19:23:17 +01:00
Laurent Destailleur
350bcea183 Merge 2013-03-22 17:10:17 +01:00
Laurent Destailleur
7703537b96 New: Work on cron module 2013-03-17 19:39:53 +01:00
Grand Philippe
e1baf806b9 change birth instead of naiss 2013-03-13 22:17:03 +01:00
Laurent Destailleur
5bc66318c2 New: use dolGetFirstLastname() everywher we should. 2013-03-11 15:54:01 +01:00
Laurent Destailleur
b43fffafa9 Fix: Regression after renaming of fields 2013-03-08 01:31:45 +01:00
Laurent Destailleur
1d76b3153e Start to work onto payment return 2013-02-28 17:37:07 +01:00
Grand Philippe
44dee53350 english language standardization 2013-02-25 18:21:12 +01:00
Grand Philippe
b081589129 english language standardization 2013-02-25 09:52:24 +01:00
Grand Philippe
86de772b31 english language standardization 2013-02-24 17:08:52 +01:00
Grand Philippe
4f9f32eb3e english language standardization 2013-02-23 16:37:17 +01:00
Grand Philippe
9400d9897a english standardization 2013-02-23 10:35:46 +01:00
Laurent Destailleur
56e11e52fa New: hookmanager class is used frequently and is a factory object, so we 
can move it during init of environment and use it globally.
 2013-01-25 19:12:54 +01:00
Laurent Destailleur
fa2e9cbd4f Exclude external modules 2013-01-24 10:06:39 +01:00
Laurent Destailleur
abb6daf2dc Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/core/boxes/box_activity.php
 2013-01-19 16:29:16 +01:00
Laurent Destailleur
0e13b3872d Fix: Removed warnings 2013-01-19 14:32:37 +01:00
Laurent Destailleur
d11cee399a Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	COPYRIGHT
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
	htdocs/install/mysql/tables/llx_c_availability.sql
 2013-01-16 15:45:17 +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
9812c91aff Fix: wrong EOL !!!!!!! 2013-01-10 08:27:12 +01:00
Cedric GROSS
ff3231045b Fix: A better fix for escaping data: escape for database must be done 
during sql request forging. Also renamed tag to tag.

Merge:
Security fix emailing read and
unsubscribe

unsubscribe can lead to email disclosure

Conflicts:
	htdocs/public/emailing/mailing-unsubscribe.php
 2013-01-04 18:08:34 +01:00
Laurent Destailleur
86645d8be9 Fix: Field birthday must be hidden for moral members 2013-01-04 00:23:46 +01:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Laurent Destailleur
1722d58196 Fix: Selection of choice in demo page 2012-12-28 22:05:36 +01:00
Laurent Destailleur
5cf07a214c Fix: Close db at wrong place 2012-12-16 19:42:58 +01:00
Regis Houssin
b09a44701e Fix: wrong EOL 2012-12-13 13:08:03 +01:00
Regis Houssin
5f41174cfa Fix: bad path for photo and uniformize code 2012-12-13 11:42:59 +01:00
Laurent Destailleur
bdb112c820 Fix: Using bad root url. 2012-12-12 14:46:13 +01:00
Laurent Destailleur
2c2465ffad Comment to make test 2012-12-12 13:14:28 +01:00
Laurent Destailleur
caf897cfa7 Clean code to help debug pb with payment methods. 2012-12-12 01:49:23 +01:00
Laurent Destailleur
e53f6a383d Fix: Removed a hard coded error code. 2012-11-20 11:23:34 +01:00
fhenry
e12999bcfd Correct fix 2012-11-06 15:39:47 +01:00
fhenry
3651b8895e Fix bug on mass mailling unsubsscribe fonctionnality 2012-11-06 14:21:17 +01:00
Regis Houssin
43c0a03758 Fix: strict mode tornado 2012-09-15 11:21:22 +02:00
Regis Houssin
e19f8c54f1 Fix: strict mode hurricane 2012-09-15 10:01:35 +02:00
Laurent Destailleur
29b4e1f57a Removed not available module from demo 2012-09-13 09:19:45 +02:00
Laurent Destailleur
41078019dd Make demo of foundation at end 2012-09-12 17:24:39 +02:00
Laurent Destailleur
0cf89eac08 Doxygen 2012-09-08 02:17:08 +02:00
Regis Houssin
ee1cf819f7 Fix: mass convert line delimiters 2012-09-07 17:23:16 +02:00
Laurent Destailleur
26b05212c7 Fix: Missing include 2012-08-28 09:33:43 +02:00
Laurent Destailleur
bdaaa1d038 New: [ task #494 ] Send an email to foundation when a new member has 
auto-subscribed
 2012-08-26 22:33:27 +02:00
Marcos García
9b3c89ac47 Removed parenthesis from all include and include_once and replaced with single quotes 2012-08-23 02:40:41 +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
Marcos García
cc4d5ff8d8 Removed the use of duplicated key translations 
Nature is now being used instead of MorPhy
UserTitle is now being used instead of Civility
VATIntraVeryShort was being used were not necessary
 2012-08-15 18:55:32 +02:00
Marcos García
3e1e508bf3 Fixed bug #485 
Merged patch from J. Fernando Lagrange (lowmemory)
https://doliforge.org/tracker/?func=detail&aid=485&atid=246&group_id=144
 2012-08-14 09:57:03 +02:00
Regis Houssin
6f1651309e Fix: global converting lines delimiter 2012-07-02 19:30:37 +02:00
Laurent Destailleur
57c8797459 Fix: Subscription must use company name when type is "moral" 2012-05-28 22:09:36 +02:00
Laurent Destailleur
0cbe83aaed Fix: W3C 2012-05-16 12:33:10 +02:00
Laurent Destailleur
5541c2b693 Fix: Exclude nltechno modules from demo 2012-05-13 19:13:41 +02:00
Regis Houssin
fb2cd3d842 Fix: more compatibility with multicompany 2012-05-09 12:45:19 +02:00
Regis Houssin
12b6d6c0ef Fix: MultiCompany compatibility for public page 2012-05-04 13:21:00 +02:00
FHenry
5ed77c8d40 Rename global variable from MAIN_SOCIETE_UNSUBSCRIBE to 
MAILING_EMAIL_UNSUBSCRIBE to be reliable on dolibarr implementation
 2012-04-22 11:19:04 +02:00
Laurent Destailleur
2670f356f1 Fix: no mainmenu nor leftmenu into public pages 2012-04-18 13:04:05 +02:00
Laurent Destailleur
9114fec4ed Doxygen 2012-04-16 12:01:32 +02:00
Laurent Destailleur
0438bee3e2 Fix: Bad name 2012-04-05 21:03:47 +02:00
Laurent Destailleur
befaf655aa Fix: Disable feature by default. Need option MAIN_SOCIETE_UNSUBSCRIBE to 
enable because feature is a security hole.
 2012-04-05 21:02:00 +02:00
FHenry
6d9d0c60e2 . 2012-04-05 16:50:00 +02:00
Laurent Destailleur
5e4af76585 Fix: Add cache directive for all export types 2012-04-04 17:42:50 +02:00
FHenry
5bfff3920f Module e-maillling : Correctif et evolution Accusé de lecture et 
desinscription
 2012-04-04 15:23:32 +02:00
FHenry
872f580b37 Just comment and Log change 2012-04-03 23:03:26 +08:00
Laurent Destailleur
2eced65db9 Fix: Use cache only if we ask it 2012-04-03 16:41:39 +02:00
Raphaël Doursenaud
55fbbc85a5 Agenda export: Tweaked HTTP headers for Google Agenda import 2012-04-03 17:27:48 +08:00
Laurent Destailleur
5ba7d88c36 Fix: Error when url is too long 2012-04-02 13:28:22 +02:00
Laurent Destailleur
96b369e9db Fix: Duplicate fields 2012-04-02 13:10:22 +02:00
Laurent Destailleur
58e35b307c New: Add option MEMBER_MIN_AMOUNT to force subscription never lower than 
value
 2012-04-02 12:32:55 +02:00
Laurent Destailleur
12b580a979 Update the about page. 2012-03-10 13:52:08 +01:00
Laurent Destailleur
6059cc64cf Trans 2012-03-10 13:39:17 +01:00
Laurent Destailleur
708561b51a Qual: Move hard coded styles into CSS id/class. 2012-03-10 01:07:35 +01:00