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

1261 Commits

Author SHA1 Message Date
frederic34
1108458de8 Optioncss 2015-10-04 11:45:02 +02:00
frederic34
835633f92a Optioncss cotisations adhérent 2015-10-04 11:17:19 +02:00
frederic34
9a021e6de4 Optioncss not kept in list 2015-10-04 10:45:57 +02:00
Laurent Destailleur
c0c0cc2415 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/interventions.lang
	htdocs/theme/md_exp/style.css.php
 2015-10-03 14:28:31 +02:00
Laurent Destailleur
e2a88cd010 Merge pull request #3626 from GPCsolutions/3.8-3607 
FIX #3607 Better categories setting and unsetting
 2015-10-01 13:59:05 +02:00
Laurent Destailleur
9901406634 A paswword can be set on member card but member can't login. Too much 
work to fix this into a stable version, so I just introduce a warning to
explain why and how to solve this.
 2015-10-01 10:15:07 +02:00
Laurent Destailleur
7037679718 FIX When update a member login for a member linked to a user, the login 
of user was not sync (not updated).
 2015-09-30 19:15:09 +02:00
Raphaël Doursenaud
f0466ba313 FIX #3607 Better categories setting and unsetting 
This allows triggering CATEGORY_LINK and CATEGORY_UNLINK each time.
 2015-09-30 18:47:02 +02:00
Laurent Destailleur
62792c08eb Merge pull request #3591 from GPCsolutions/inherited 
[Qual] Cleanup of inherited class properties
 2015-09-26 11:23:59 +02:00
Juanjo Menent
6999ad0a4f Merge pull request #3587 from GPCsolutions/fiche_titre 
[Qual] Replaced deprecated function calls.
 2015-09-26 08:39:22 +02:00
Raphaël Doursenaud
67ddb6c94e [Qual] Cleanup of inherited class properties 2015-09-24 20:12:55 +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
Raphaël Doursenaud
9f2545b95d [Qual] Replaced deprecated dol_clone by native clone 2015-09-24 17:24:40 +02:00
Laurent Destailleur
615734012e Merge pull request #3476 from marcosgdf/refactor 
Refactor: Created hasDelay functions
 2015-09-09 20:50:58 +02:00
Marcos García de La Fuente
865489db75 Created Adherent::hasDelay function 2015-09-05 11:03:37 +02:00
Juanjo Menent
a720f30335 Merge pull request #3194 from defrance/patch-71 
NEW add hook addMoreActionsButtons on adherent Card
 2015-09-04 18:33:19 +02:00
Laurent Destailleur
36a1fa6fbe Fix missing backtopage param 2015-07-29 12:38:02 +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
aspangaro
b9b6abd7a8 Merge remote-tracking branch 'Upstream/3.8' into 3.8-1 2015-07-18 05:29:57 +02:00
aspangaro
fb0f50cf4b Fix: #3229 [Members] Cancelling member type creation yields weird bug 2015-07-17 06:11:06 +02:00
aspangaro
59e88590e0 Move my address email to new one 2015-07-15 20:30:33 +02:00
BENKE Charlie
3cfa76a120 add hook addMoreActionsButtons on adherent Card 2015-07-14 02:33:17 +02:00
Laurent Destailleur
1fb40565f4 Fix bad parameters of function select_date 2015-07-12 12:50:24 +02:00
Laurent Destailleur
dc050d39eb Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/adherents/type.php
	htdocs/core/boxes/box_task.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/js/lib_batch.js
	htdocs/core/modules/modUser.class.php
	htdocs/fichinter/card.php
	htdocs/fourn/commande/card.php
	htdocs/societe/consumption.php
	htdocs/user/info.php
	htdocs/user/note.php
	htdocs/user/param_ihm.php
	htdocs/user/perms.php
 2015-06-29 00:09:28 +02:00
Laurent Destailleur
9c99cae911 FIX XSS security using the onerror and missing escapement on type of 
member page.
 2015-06-28 23:32:38 +02:00
Laurent Destailleur
ce6039f7f6 NEW Replace category edition page on members with new select2 component. 2015-06-27 23:01:05 +02:00
Laurent Destailleur
bfa0f0d576 Minor look enhancement 2015-06-22 17:20:06 +02:00
Laurent Destailleur
cac7b1f49f NEW Add hooks on list of members to allow an external module to add more 
fields into list view.
 2015-06-22 16:34:25 +02:00
Laurent Destailleur
a27212644e NEW Can add project search on left menu search area 2015-06-22 11:55:21 +02:00
Raphaël Doursenaud
ecd5ebcb44 Member type ref is not deprecated 2015-06-01 11:10:52 +02:00
Raphaël Doursenaud
3f9270ea78 Qual: added deprecation hinting 
Added deprecation hinting for class properties
Added syslog warning events for deprecated functions, methods and/or their parameters
Added hinting for some constants
 2015-06-01 11:00:11 +02:00
Laurent Destailleur
3588d73c8e Fix css 2015-05-31 16:36:11 +02:00
Laurent Destailleur
01aad8516d Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/adherents/list.php
	htdocs/compta/dons/card.php
	htdocs/compta/dons/class/don.class.php
	htdocs/contact/list.php
	htdocs/contrat/list.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/security.lib.php
	htdocs/main.inc.php
	htdocs/product/stock/massstockmove.php
	htdocs/public/test/test_arrays.php
	htdocs/public/test/test_forms.php
	htdocs/societe/societe.php
 2015-05-31 03:30:38 +02:00
Laurent Destailleur
11d4a945b0 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/adherents/liste.php
	htdocs/comm/propal.php
	htdocs/compta/facture.php
	htdocs/contact/list.php
	htdocs/contrat/liste.php
	htdocs/product/liste.php
 2015-05-25 18:08:23 +02:00
Laurent Destailleur
a33809a526 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/adherents/liste.php
	htdocs/comm/propal.php
	htdocs/compta/facture.php
 2015-05-25 17:46:42 +02:00
Raphaël Doursenaud
becc240b92 Include Categories class whenever Categorie::TYPE is used 2015-05-23 23:35:49 +02:00
Raphaël Doursenaud
ee808cdfd7 Added types constants to categories 2015-05-23 18:52:31 +02:00
Laurent Destailleur
4319cd63a3 Working on finishing of look 2015-05-22 14:28:02 +02:00
Raphaël Doursenaud
a7f6bbd316 Properly escape untrusted data to prevent HTML injection. 
First pass for #2857
 2015-05-20 17:34:00 +02:00
aspangaro
de5a15282c Adherent review 2015-05-20 06:25:43 +02:00
aspangaro
124dbbc2f2 Members: Add background in create mode in type adherent 2015-05-19 22:36:35 +02:00
Laurent Destailleur
a258370f8a Prepare code for generic solution where all path are forged using 
get_exdir.
 2015-05-18 22:25:51 +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
Laurent Destailleur
6d95de48c2 Css fixes 2015-05-14 20:49:22 +02:00
Raphaël Doursenaud
0d8641a073 [Qual] Use jQuery property instead of attribute to test and set checked 2015-05-12 14:51:30 +02:00
Raphaël Doursenaud
b8d9c20731 [Qual] Fixed HTML input form disabled attribute 
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form disabled attribute should not have a value.
 2015-05-07 14:21:14 +02:00
Raphaël Doursenaud
859d1b0df9 [Qual] Fixed HTML input form checked attribute 
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form checked attribute should not have a value.
 2015-05-07 14:21:14 +02:00
Laurent Destailleur
b71e5a1025 Merge pull request #2673 from aternatik/fix_getentity 
Fix : missing getEntity calls
 2015-05-07 00:48:19 +02:00