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

263 Commits

Author SHA1 Message Date
Laurent Destailleur
4a25317f10 Fix security on GETPOST('action'). Param must be sanitized. 2018-11-05 20:29:07 +01:00
Laurent Destailleur
c0f4ec5a3e FIX sanitize param $action 2018-11-05 17:53:31 +01:00
Laurent Destailleur
68ec172798 Fix setup to enable reminder b email 2018-11-03 12:37:52 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Philippe GRAND
a6d13b06b0 Standardize and update call to 2018-09-07 10:40:36 +02: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
dfda029da4 FIX a removed option was still in setup 2018-09-01 17:44:07 +02:00
Frédéric FRANCE
945eede4a5
doxygen fixs 2018-08-31 23:12:55 +02:00
Philippe GRAND
f17275845d standardize 2018-07-28 14:29:28 +02:00
Laurent Destailleur
94ccb44673 Fix bad url wor external subscription page 2018-05-12 11:02:44 +02:00
Laurent Destailleur
7363ae17ee Move setup of email for module module into email templates 2018-03-23 16:09:46 +01:00
Laurent Destailleur
517301f014 Work on subscription reminder 2018-03-21 16:40:09 +01:00
Laurent Destailleur
41638e6dff Fix back link of look and feel v7 2018-02-26 09:20:05 +01:00
Laurent Destailleur
0fb3669529 Fix for #8071 2018-01-20 18:33:25 +01:00
Laurent Destailleur
9f0f5eb5e8 Fix translation of extrafields type 2017-10-24 18:05:43 +02:00
Regis Houssin
e2206d9bf2 Fix: uniformize substitution tags 2017-10-09 16:33:22 +02:00
Laurent Destailleur
fcf82f1163 Enhancement into setup of member module 2017-09-12 11:17:23 +02:00
Laurent Destailleur
0458b7d38f Fix css subscription form 2017-06-09 17:29:34 +02:00
Laurent Destailleur
57ba598b15 Merge pull request #6771 from aspangaro/6.0-stripe 
New : Module Stripe
 2017-05-13 19:55:29 +02:00
Laurent Destailleur
f7e042d7b8 Look and feel v6 2017-05-13 13:02:55 +02:00
Alexandre SPANGARO
c3fe1c963a Merge remote-tracking branch 'uptream/develop' into 6.0-stripe 2017-04-22 06:33:31 +02:00
Alexandre SPANGARO
fed6d71d8a Merge remote-tracking branch 'uptream/develop' into 6.0-stripe 2017-04-17 06:51:02 +02:00
Laurent Destailleur
846204bdb4 Replace usage of $bc[$var] with class="oddeven" 2017-04-14 13:02:29 +02:00
Laurent Destailleur
39ebaec064 Replace usage of $bc[$var] with class="oddeven" 2017-04-14 11:22:48 +02:00
philippe grand
b0f2d2310b Update code using new css class 2017-04-12 10:28:05 +02:00
guillaume-uH57J9
e335b757fd Add UI to configure MEMBER_NEWFORM_FORCETYPE 
Use tertiary operator ($var?: -1) instead of (!empty($var) ? $var : -1)
 2017-04-09 22:37:17 +02:00
Alexandre SPANGARO
942b58efaf New : Integration of Stripe 2017-02-22 06:33:52 +01:00
aspangaro
2dbeeedd14 Move tab menu for subscription in member.lib 
Move all pages for subscription member in adherent/subscription (Card / Info / List)
Rename llx_cotisation in llx_subscription
Rename all db field cotisation in subscription
Rename class Cotisation in class Subscription
 2016-09-24 06:48:40 +02:00
novalore
1227ee5eb6 Miscellaneous typos and errors in en_US lang files 2016-06-04 00:14:56 +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
philippe grand
3767ab437e [Qual] Uniformize code 2015-10-23 12:58:30 +02:00
Laurent Destailleur
b3491ef4e5 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	ChangeLog
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/admin/facture_cust_extrafields.php
	htdocs/compta/facture/admin/facturedet_cust_extrafields.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/card.php
 2015-10-16 10:12:36 +02:00
philippe grand
0841feda47 syntax error 2015-10-08 09:40:00 +02:00
Raphaël Doursenaud
631ee83745 [Qual] Replaced deprecated print_fiche_titre() 2015-09-24 18:34:58 +02:00
Raphaël Doursenaud
dabfad1529 [Qual] Replaced deprecated print_titre() 2015-09-24 18:27:13 +02:00
Laurent Destailleur
ff8969073c Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/main.inc.php
 2015-07-28 18:57:13 +02:00
Florian HENRY
c0412acdea FIX : #3318 2015-07-27 13:03:47 +02:00
Laurent Destailleur
1b03e348d3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/compta/bank/annuel.php
 2015-05-16 02:53:36 +02:00
jfefe
c905f88498 Change generic and setup image title 2015-04-18 23:13:48 +02:00
philippe grand
eaf0fda6aa fix syntax errors 2015-04-18 18:07:41 +02:00
Laurent Destailleur
b888a04af9 Reduce a lot of duplicate code. Move all tables of extrafields setup 
into a tpl file.
 2015-02-28 20:14:26 +01:00
Laurent Destailleur
e3713c8b6d Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/admin/tools/eaccelerator.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/dispatch.php
 2015-02-19 00:01:26 +01:00
Marcos García de La Fuente
157a6e109e Misc Adherents PHPDoc corrections 2015-02-10 10:45:48 +01:00
Laurent Destailleur
f884f16564 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/admin/boxes.php
	htdocs/comm/action/card.php
	htdocs/core/class/html.formfile.class.php
 2014-12-03 12:54:42 +01:00
Laurent Destailleur
253fd83aca Fixed: When invoice is created from subscription, the accountancy code 
was wrong because product added was a free product using default value
for accountancy code. Fix is to choose product into member module
page.
 2014-12-01 13:26:05 +01:00
aspangaro
c4c69e191b Replace <center> tags 2014-11-25 20:13:43 +01:00
Laurent Destailleur
5e0946bdc2 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/adherents/fiche.php
	htdocs/core/lib/date.lib.php
	htdocs/langs/fr_FR/bills.lang
	htdocs/resource/class/resource.class.php
 2014-11-05 16:37:07 +01:00
aspangaro
57f49ec5d4 GPLv3 2014-10-30 20:41:08 +01:00
KreizIT
c94c0699d8 Fix : [ bug #1549 ] Itïs not possible add ExtraFields 2014-08-06 17:38:44 +02:00
Marcos García de La Fuente
4f4ac30fc0 Deprecating arbitrary use of dol_htmloutput* functions 2014-07-20 02:32:13 +02:00
Marcos García de La Fuente
434bb1bec7 Migrated old message notifications to the """new""" system 2014-07-20 00:10:40 +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
philippe
8dc23025ed anglicized 2014-04-06 16:06:54 +02:00
philippe
43c85cc446 anglicized 2014-04-05 17:14:57 +02:00
Marcos García de La Fuente
54b9f72977 Unified module name in members admin page and added spacing before submit button 2014-03-11 11:31:37 +01:00
Laurent Destailleur
0e743d5024 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	ChangeLog
	htdocs/adherents/admin/adherent.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/document.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/compta/facture/list.php
	htdocs/cron/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/fourn/commande/document.php
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/cron.lang
	htdocs/langs/fr_FR/projects.lang
	htdocs/langs/nl_NL/admin.lang
	htdocs/langs/nl_NL/categories.lang
	htdocs/langs/nl_NL/commercial.lang
	htdocs/langs/nl_NL/companies.lang
	htdocs/langs/nl_NL/dict.lang
	htdocs/langs/nl_NL/main.lang
	htdocs/langs/nl_NL/margins.lang
	htdocs/langs/nl_NL/products.lang
	htdocs/societe/class/societe.class.php
	htdocs/societe/rib.php
 2013-11-19 21:08:02 +01:00
Grand Philippe
a14de0c035 fix : language 2013-11-05 15:29:33 +01:00
Grand Philippe
c5f29e14a4 missing trad and fix language 2013-11-02 17:50:24 +01:00
Laurent Destailleur
3fde695c94 Qual: Uniformise name of include files we use to share common code found 
into Actions area of pages (controllers).
 2013-09-23 13:22:28 +02:00
Laurent Destailleur
c151ef7b87 Qual: Remove duplicate form instanciation. 2013-09-06 12:10:09 +02:00
Laurent Destailleur
afae841ae4 Fix: Permissions on files 2013-08-06 00:36:21 +02:00
Laurent Destailleur
c41a955cbe Fix: Permissions on files 2013-08-06 00:36:04 +02:00
Laurent Destailleur
02f1271fc4 New: Add option ADHERENT_LOGIN_NOT_REQUIRED 2013-06-14 01:30:43 +02:00
Laurent Destailleur
499440be16 Merge remote-tracking branch 'origin/3.4' into develop 2013-06-14 01:29:43 +02:00
Laurent Destailleur
c1b21d1480 Fix: Option not working 2013-06-14 01:29:05 +02:00
Laurent Destailleur
eac4aa7e28 New: Module mailman can subscribe/unsubscribe to ML according to 
categories of member.
 2013-06-05 15:44:42 +02:00
Laurent Destailleur
cc500cceba Fix: form into table is not W3C (broken with some uncommon browsers). 2013-05-09 22:39:31 +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
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
Grand Philippe
d7f2c9c480 some fixes for missing names 2013-04-08 14:21:42 +02:00
Grand Philippe
707ef0f378 some fixes for missing names 2013-04-08 14:12:46 +02:00
Marcos García
6252857440 Fixed translations and BILL_SUPPLIER_BUILDDOC trigger 2013-04-06 17:56:10 +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
76910d4159 Look: Start to use div to render actions buttons 2013-04-03 18:37:54 +02:00
Laurent Destailleur
89365786a8 New: enhance tool fixdosfiles.sh 
Convert DOS files to unix
 2013-03-30 14:27:13 +01:00
jfefe
013eac1147 Better error management when add/update extrafield 
Usage of setEventMessage() function
 2013-03-27 21:24:45 +01:00
Grand Philippe
e1baf806b9 change birth instead of naiss 2013-03-13 22:17:03 +01:00
Laurent Destailleur
baf6ccf654 New: Can define of we want to use VAT or not for subscriptions 
(foundation module).
New: Can define a default choice for choice "More action when
recording a subscription" (foundation module).
 2013-03-06 17:16:26 +01:00
Laurent Destailleur
9eaf8af341 Fix: Removed warning (this can be normal behaviour) 
Fix: menu manager name has changed
 2013-01-28 15:35:29 +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
fhenry
23b2aa6a7b [ task #664 ] Add extrafields behaviours to Member Type 2013-01-08 19:16:39 +01:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Regis Houssin
5740c7e694 Fix: change for a neutral email 2012-12-30 15:11:07 +01:00
Laurent Destailleur
cbff238cbd New: Support property "required" for extra fields. 2012-10-25 16:23:58 +02:00
Laurent Destailleur
732b3ceace Fix: Bad error management when validating member 2012-10-22 00:18:32 +02:00
Laurent Destailleur
9bbe0e6b1c Qual: Mutuamize codeby using tpl. 
New: Support unique field for extrafields
 2012-09-22 20:27:06 +02:00
Laurent Destailleur
3953be53a7 Qual: Mutualize code 
New: Can use extrafields on contacts/addresses.
 2012-09-17 01:39:30 +02:00
Regis Houssin
e19f8c54f1 Fix: strict mode hurricane 2012-09-15 10:01:35 +02:00
Regis Houssin
7eef637776 Fix: strict mode killer 2012-09-13 11:52:50 +02:00
Laurent Destailleur
4cc56f0176 New: Extra fields supports more types (now int, string, double, date, 
datetime)
 2012-09-13 10:14:25 +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
770194aa91 Improved SPIP CMS translation 2012-08-13 06:28:34 +02:00
Laurent Destailleur
8c5e8e0690 Fix: [ bug #466 ] Module MailmanSpip 2012-07-29 15:55:19 +02:00
Marcos García
de7595922e Fixed some typos in es_ES and allowed some strings to be translated 2012-07-28 19:53:13 +02:00
Marcos García
2204c09e5a Applied commits 16-22 2012-07-27 23:04:05 +02:00
Laurent Destailleur
98676ddaa1 Qual: Enhance mailmanspip module. 
New: When a member is validated, we can subscribe to mailing-lists
according to its type.
 2012-06-10 21:49:19 +02:00
Laurent Destailleur
8cc55ae0df Fix: Warning GETPOST with alpha and int must be used ONLY if content is 
not a free text.
 2012-05-09 16:18:59 +02:00
Laurent Destailleur
8ea079ed96 New: Prepare change to allow usage of print sheet for any purpose (not 
only
memeber module).
Qual: Remove duplicate declaration of version.
 2012-04-28 16:37:58 +02:00
Regis Houssin
97cbaf0c06 Update htdocs/adherents/admin/adherent.php 2012-03-29 11:58:35 +03:00
simnandez
a0cae7709c Fix: Sanitize data 2012-03-29 09:54:48 +01:00
Regis Houssin
d8d9062606 Fix: duplicate end tag and rename form parts 2012-03-28 16:03:04 +02:00
Laurent Destailleur
f8b2a2c774 New: Move mailman and spip feature into a specific module 2012-01-11 18:43:38 +01:00
Laurent Destailleur
ef64ce3fb5 Fix: Syntax url 2012-01-08 16:58:55 +01:00
Laurent Destailleur
eb507e0677 Checkstyle 2012-01-05 11:43:09 +01:00
Laurent Destailleur
bb3d9e9197 Doxygen 2011-12-28 13:25:05 +01:00
Laurent Destailleur
56a0e26465 Fix: Removed tons of warnings 2011-12-01 17:09:01 +01:00
Regis Houssin
ca63f3d8e9 Fix: uniform code and reindent 2011-11-06 11:11:43 +01:00
Regis Houssin
56d6cbe56f [task #216] Move lib in core directory 2011-10-24 12:59:44 +02:00
Regis Houssin
63d60a33fc [task #216] Move lib in core directory 2011-10-24 11:25:54 +02:00
Regis Houssin
ecc5519a4e Move core lib files in /core/lib 2011-10-24 09:49:50 +02:00
Regis Houssin
30c5f4b214 Move all core class in htdocs/core/class 2011-10-24 09:29:17 +02:00
Laurent Destailleur
d23fc2b8e5 Oops. Forget to publish this. Commit again. 2011-10-14 16:02:18 +02:00
eldy
a3e7ec7dc0 Qual: Mutualized common code. Move module admin pages into admin 
directory.
 2011-09-28 14:13:48 +02:00
Laurent Destailleur
e82923b525 Fix: Removed warnings 2011-09-21 13:24:27 +00:00
Regis Houssin
5efe1cd470 Fix: Perl-style comments are not allowed. Use "// Comment." or "/* comment */" instead. 2011-09-20 10:30:56 +00:00
Regis Houssin
b6a2f13673 Fix: avoid jenkins warning 
Fix: SpaceAfterOpenBracket, SpaceAfterCloseBracket, SpaceBeforeCloseBracket, SpaceBeforeOpenBracket
 2011-09-20 09:40:27 +00:00
Juanjo Menent
2be113d885 Uniformize code 2011-09-02 13:15:39 +00:00
Juanjo Menent
7faa198bb0 Uniformize code 2011-09-02 13:15:39 +00:00
Juanjo Menent
febc2a2d6d Uniformize code 2011-09-02 13:15:39 +00:00
Juanjo Menent
0ce2c045f1 Uniformize code 2011-09-02 13:15:39 +00:00
Juanjo Menent
d11a2450e4 Uniformize code 2011-09-02 13:15:39 +00:00
Juanjo Menent
d6906896ae Uniformize code 2011-09-02 13:15:39 +00:00
Juanjo Menent
4937999b26 Uniformize code 2011-09-02 13:15:39 +00:00
Juanjo Menent
c784c17f7c Uniformize code 2011-09-02 13:15:39 +00:00
Juanjo Menent
86709e93d1 Uniformize code 2011-09-02 13:15:39 +00:00
Juanjo Menent
a8991a0300 Uniformize code 2011-09-02 13:15:39 +00:00
Juanjo Menent
17ad4d4146 Uniformize code 2011-09-02 13:15:39 +00:00
Juanjo Menent
9956edb4fc Uniformize code 2011-09-02 13:15:39 +00:00
Laurent Destailleur
e96e17599d Doxygen 2011-09-02 20:53:40 +00:00
Juanjo Menent
60eda91f2c Uniformize code 2011-09-02 13:15:39 +00:00
Juanjo Menent
64f4ad4bda Uniformize code 2011-09-02 13:15:39 +00:00
Juanjo Menent
7ced92a40b Uniformize code 2011-09-02 13:15:39 +00:00
Regis Houssin
726d9581dd Fix: remove obsolete tags (in progress) 2011-08-27 14:24:16 +00:00
Laurent Destailleur
0adbca4625 Qual: Mutualize a lot of duplicate functions into functions.lib.php 2011-08-17 15:56:22 +00:00
Laurent Destailleur
f4606c2253 Fix: Avoid errors into rpm packages 2011-08-03 00:45:22 +00:00
Laurent Destailleur
c2b7ce16c1 Fix: Debug new features 2011-07-18 19:25:46 +00:00
Laurent Destailleur
3ce248afe5 Trans 2011-07-05 20:39:36 +00:00
Laurent Destailleur
503ff66100 New: Can edit options of autosubscribe form for member module 2011-07-03 16:00:18 +00:00
Laurent Destailleur
aef6c2641d Add link to module page 2011-06-22 18:19:21 +00:00
Laurent Destailleur
fb2e7c063e New: Can use extrafields on third parties. 2011-06-22 16:24:20 +00:00
Laurent Destailleur
e302e7f9a0 Uniformize position of extra fields tabs (should be in admin module page). 2011-06-22 15:43:14 +00:00
Laurent Destailleur
e5d3de79ee New: Subscription/Unsubscription to mailman mailing-list can be done on validate/resiliate in foundation module. 2011-06-22 14:56:11 +00:00
Laurent Destailleur
5fbe077deb Add option ADHERENT_LOGIN_NOT_REQUIRED 2011-03-06 13:55:47 +00:00