Commit Graph

72 Commits

Author SHA1 Message Date
Regis Houssin
359318392f FIX missing entity filter in function "build_filterField()" (export) 2019-02-14 10:47:07 +01:00
Laurent Destailleur
cb9ada2119 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/class/html.formmail.class.php
	htdocs/core/modules/modSociete.class.php
	htdocs/product/price.php
2018-12-01 18:19:45 +01:00
Maxime Kohlhaas
5dcb3d2a1f Fix extrafields in import tool 2018-11-30 19:23:05 +01:00
Laurent Destailleur
9dbb0eaab0 Fix cron task label 2018-08-21 14:01:03 +02:00
Frédéric FRANCE
e2a557aadd limit length of lines to 500 chars 2018-05-27 15:04:12 +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
003827eb06 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-25 15:01:19 +01:00
Laurent Destailleur
029ef534d0 Clean deprecated code (property "special" removed from mod descriptor) 2018-02-25 10:55:02 +01:00
Regis Houssin
4c06384197 Fix: differentiate sharing of "member" and "member_type" 2018-02-24 11:13:14 +01:00
Regis Houssin
e2206d9bf2 Fix: uniformize substitution tags 2017-10-09 16:33:22 +02:00
Laurent Destailleur
9cd5c8a564 Code comment 2017-08-22 18:34:58 +02:00
Regis Houssin
5c5663c5ae New: getEntity function use true $shared value by default 2017-05-30 18:50:54 +02:00
Laurent Destailleur
6f9e67b1fb Remove no more used constant 2017-05-13 13:08:25 +02:00
Laurent Destailleur
fa290c34fa Fix against SQL injection. Add phpunit to detect missing escapement. 2017-05-12 16:55:11 +02:00
Laurent Destailleur
db9af0118c Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/modules/modAdherent.class.php
2016-12-06 14:08:43 +01:00
Laurent Destailleur
0d7ab3301b FIX in export. Error when using a separate extrafields. 2016-12-06 11:52:07 +01:00
Laurent Destailleur
51df25509e Fix conflicts on default doc template when enabling/disabling modules 2016-10-02 20:00:57 +02:00
Laurent Destailleur
5a1e96b598 FIX #5823 better multicompany support for member module 2016-10-01 18:55:37 +02:00
Laurent Destailleur
287f9972a8 Merge branch 'new_no_default_rights' of
https://github.com/atm-maxime/dolibarr into
atm-maxime-new_no_default_rights

Conflicts:
	htdocs/langs/en_US/admin.lang
2016-09-30 13:04:14 +02:00
Laurent Destailleur
94dbe3da3f Fix the info if module are provided by module or not was wrong 2016-09-30 13:02:13 +02: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
Maxime Kohlhaas
857454a28d For each module, no default permission on activation 2016-06-04 12:16:30 +02:00
Laurent Destailleur
1e1d6d4955 Fix to be able to use dolibarr with a smartphone 2016-01-03 19:34:19 +01:00
Laurent Destailleur
f5631cac45 NEW Introduce property module_position so a module can decide where it
appears into list of modules.
2015-11-17 00:58:12 +01:00
Laurent Destailleur
94723a9b83 Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/langs/en_US/accountancy.lang
2015-09-12 15:23:02 +02:00
Laurent Destailleur
97096536b1 Fix #2526 The filter on type numeric is ok now. Sometimes we used
"Number", sometimes "Numeric". I moved to "Numeric" everywhere to solve
bug and added a warning in log if an unknow value is still used in code.
2015-09-12 15:20:55 +02:00
philippe grand
706f62d8f2 better display for code 2015-09-07 17:02:53 +02:00
philippe grand
ec21916d3b translations missing 2015-09-07 15:55:26 +02:00
philippe grand
887a4107a1 translations missing 2015-09-07 15:40:55 +02:00
philippe grand
3a6271e714 translations missing 2015-09-07 15:29:51 +02:00
Marcos García de La Fuente
eff573e753 Removed duplicated code from core modules 2015-07-07 13:08:26 +02:00
Laurent Destailleur
8a7728f193 Merge pull request #2752 from fappels/develop-tcpdfbarcode
NEW add tcpdf barcode generator and printing, add 2d Datamatrix and QRcode CLOSE #2655
2015-05-03 21:19:01 +02:00
Francis Appels
f9ece24f95 Fix: Member card header/footer text 2015-05-03 10:09:31 +02:00
Juanjo Menent
91767edd05 Fixed SQL table reference for members types in export 2015-04-30 20:50:05 +02:00
Laurent Destailleur
305030ae6c Fix test to match new field names of note 2015-04-22 21:58:12 +02:00
Laurent Destailleur
57c84089fe Introduce warning to remind to do a backup before migration.
Required because we discovered, during beta, serious bugs into some
databases system loosing data.
2015-01-25 22:29:36 +01:00
aspangaro
f774ff487b Merge branch 'Upstream/develop' 2014-08-18 11:56:49 +02:00
aspangaro
1a87d98357 Qual: Renamed table llx_c_civilite into llx_c_civility
field civilite into label in the same table and field civilite into civility in other table
2014-08-12 06:03:27 +02:00
aspangaro
671f8e0be5 Correct 2014-08-11 14:03:30 +02:00
aspangaro
0738103da8 Renamed llx_c_pays to llx_c_country & field "libelle" to "label" 2014-08-10 13:37:39 +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
Laurent Destailleur
d97c45a9b8 Add version of phpunit into travis script.
Fix: strict mode.
2014-05-01 19:17:45 +02:00
Laurent Destailleur
a8096c7359 New: Export/import profile include state. 2013-08-31 12:43:41 +02:00
Laurent Destailleur
3b88142ba8 Fix: Import of extra field for members 2013-06-14 02:41:08 +02:00
Laurent Destailleur
13b3a3c850 Fix: Export of extra field for members 2013-06-14 02:35:30 +02:00
Laurent Destailleur
da73a8d84c Fix: syntax error
Fix: Bad field param
2013-05-31 16:39:34 +02:00
simnandez
5fa2598a6f Fix: [ bug #916 ] Same for Thirds and Members 2013-05-30 17:58:48 +02:00
Laurent Destailleur
271dcf578f Fix: Better error message during import of csv with records split onto
several lines.
2013-04-25 23:49:24 +02:00
Grand Philippe
e1baf806b9 change birth instead of naiss 2013-03-13 22:17:03 +01:00