2
0
forked from Wavyzz/dolibarr
Commit Graph

2265 Commits

Author SHA1 Message Date
Laurent Destailleur
c3beb854a2 Definition of $fields for member and subscriptions 2020-02-08 13:44:31 +01:00
Scrutinizer Auto-Fixer
9781c20f84 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-02 18:34:09 +00:00
Laurent Destailleur
55388d053f Var not defined 2020-01-30 13:01:42 +01:00
Laurent Destailleur
a88e1ac605 Better translation 2020-01-28 21:35:03 +01:00
Laurent Destailleur
936899e0e2 Merge pull request #12952 from ptibogxiv/patch-297
NEW: add member to validate on dashboard
2020-01-28 21:30:16 +01:00
stickler-ci
1c26139789 Fixing style errors. 2020-01-28 20:29:17 +00:00
ptibogxiv
ae1dbdd34f Update adherent.class.php 2020-01-28 21:27:11 +01:00
Laurent Destailleur
be2d6494a7 FIX #12908 2020-01-28 21:23:05 +01:00
Laurent Destailleur
80707d6a5e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-28 17:24:26 +01:00
Laurent Destailleur
471e1d71a0 Fix send remind by email 2020-01-28 11:38:27 +01:00
Laurent Destailleur
a9790f355d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-21 11:32:40 +01:00
Laurent Destailleur
f2ed97dada Fix default value 2020-01-21 10:29:41 +01:00
Laurent Destailleur
c203e21966 Fix default values 2020-01-21 10:28:42 +01:00
Laurent Destailleur
3f79c00542 Merge branch 'develop' into actioncomm_category 2020-01-15 14:21:06 +01:00
Laurent Destailleur
f64b3262c3 Merge pull request #12475 from ptibogxiv/patch-279
NEW add WYSiWYG on member type's description
2020-01-15 14:18:08 +01:00
Laurent Destailleur
e4a03e98b7 FIX Do not record resource owner of event when not defined.
More log to track payment errors.
2020-01-01 12:47:01 +01:00
Laurent Destailleur
c0c413b219 Alignement 2019-12-31 18:32:57 +01:00
Laurent Destailleur
4e2bc6a741 Fix alignment 2019-12-31 18:23:56 +01:00
Frédéric FRANCE
90235d0528 Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-31 13:57:40 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Laurent Destailleur
db5672ae90 Fix creation/update of expense reports
Fix export of accounting documents
2019-12-18 23:07:26 +01:00
Laurent Destailleur
838633d0de Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/system/filecheck.php
	htdocs/api/class/api_setup.class.php
	htdocs/compta/facture/card.php
	htdocs/compta/stats/index.php
	htdocs/core/actions_massactions.inc.php
	htdocs/install/upgrade2.php
	htdocs/loan/card.php
	htdocs/loan/document.php
	htdocs/loan/info.php
	htdocs/loan/note.php
	htdocs/loan/schedule.php
	htdocs/product/list.php
	htdocs/ticket/card.php
	htdocs/user/class/user.class.php
2019-12-14 14:53:49 +01:00
Laurent Destailleur
835d22f556 Merge branch 'develop' into doxygen_todo 2019-12-14 13:46:40 +01:00
Frédéric FRANCE
57055bad03 Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-13 14:36:00 +01:00
Laurent Destailleur
a612aefab7 Fix HTML5 2019-12-12 11:11:08 +01:00
Frédéric FRANCE
307bad1d2a doxygen todo 2019-12-11 19:11:13 +01:00
Laurent Destailleur
a4272ab947 Debug v11 2019-12-06 09:20:45 +01:00
Laurent Destailleur
cb497cb08e Translation 2019-12-06 08:58:16 +01:00
Laurent Destailleur
93d66d8213 Debug v11 2019-12-06 08:50:26 +01:00
Florian Mortgat
3f6715a377 FIX: add URL param "restore_last_search_values=1" to all backlinks that point to a list 2019-12-05 15:34:41 +01:00
Frédéric FRANCE
4c5c6b6ff1 Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-03 17:56:43 +01:00
Laurent Destailleur
92070fa491 Fix name of variable $trigger_name into $triggersendname 2019-12-02 09:38:16 +01:00
Laurent Destailleur
83f7f3a6e9 Trans 2019-12-01 18:16:51 +01:00
Frédéric FRANCE
25ed2b930f Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-01 16:10:37 +01:00
Laurent Destailleur
3eec2430eb Merge pull request #12585 from atm-john/develop_factoring_token_usage
Factoring token usage
2019-12-01 11:37:30 +01:00
Laurent Destailleur
790fdc881c # WARNING: head commit changed in the meantime
Restore file for travis
2019-12-01 10:50:56 +01:00
ATM John BOTELLA
773f823748 factoring token usage 2019-12-01 10:20:11 +01:00
Laurent Destailleur
fe37983b06 Fix inversion of mime type and mime file name 2019-11-30 12:02:05 +01:00
ptibogxiv
789e751e4a Update type.php 2019-11-20 10:55:58 +01:00
stickler-ci
54e528d659 Fixing style errors. 2019-11-20 09:38:32 +00:00
ptibogxiv
a3e7c4467a NEW add WYSiWYG on member type's description 2019-11-20 10:36:26 +01:00
Frédéric FRANCE
d182eee4bf Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-19 23:26:00 +01:00
Laurent Destailleur
fb70893229 Fix missing class reposition 2019-11-19 21:29:49 +01:00
Frédéric FRANCE
2e5f539b2a Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-18 17:45:52 +01:00
Scrutinizer Auto-Fixer
1648fc142e Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-16 22:24:29 +00:00
Laurent Destailleur
2689f7515c Fix pb with colspan and extrafields.
Fix remove empty id
2019-11-16 14:38:05 +01:00
Frédéric FRANCE
6784ea9fae Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-16 09:21:57 +01:00
Laurent Destailleur
d2aa4ba54e Update adherent_type.class.php 2019-11-16 00:41:55 +01:00
ptibogxiv
332c91aa11 Update adherent_type.class.php 2019-11-14 20:10:14 +01:00
ptibogxiv
fc2e0d4f95 Update adherent_type.class.php 2019-11-14 20:09:36 +01:00