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 |
|
stickler-ci
|
f369fa06a6
|
Fixing style errors.
|
2019-11-14 19:04:18 +00:00 |
|
ptibogxiv
|
892b61f1c2
|
Update adherent_type.class.php
|
2019-11-14 20:02:44 +01:00 |
|
stickler-ci
|
07880dd835
|
Fixing style errors.
|
2019-11-14 16:00:08 +00:00 |
|
ptibogxiv
|
fee8e33e2b
|
Update type.php
|
2019-11-14 16:58:17 +01:00 |
|
stickler-ci
|
280c0a56b6
|
Fixing style errors.
|
2019-11-14 15:37:54 +00:00 |
|
ptibogxiv
|
ae2ddb1f1e
|
Fix adherent type v11
|
2019-11-14 16:36:07 +01:00 |
|
Laurent Destailleur
|
8db4eff108
|
Merge pull request #12437 from Dolibarr/scrutinizer-patch-8
Scrutinizer Auto-Fixes
|
2019-11-14 12:10:44 +01:00 |
|
Scrutinizer Auto-Fixer
|
f197196719
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-14 11:09:46 +00:00 |
|
Scrutinizer Auto-Fixer
|
ddcc14dc16
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-14 11:09:15 +00:00 |
|
Frédéric FRANCE
|
a3e092b227
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-11-14 09:21:26 +01:00 |
|
Laurent Destailleur
|
171b94fc5c
|
Merge pull request #12429 from Dolibarr/scrutinizer-patch-5
Scrutinizer Auto-Fixes
|
2019-11-14 08:50:24 +01:00 |
|
Laurent Destailleur
|
86094613e8
|
Merge pull request #12428 from Dolibarr/scrutinizer-patch-4
Scrutinizer Auto-Fixes
|
2019-11-14 08:50:06 +01:00 |
|
Frédéric FRANCE
|
3bac051521
|
use class CONST
|
2019-11-14 08:07:16 +01:00 |
|
Scrutinizer Auto-Fixer
|
b40ecc3933
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 18:37:08 +00:00 |
|
Scrutinizer Auto-Fixer
|
ac40dd8bbe
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 18:35:39 +00:00 |
|
Scrutinizer Auto-Fixer
|
8a527631a0
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 18:35:02 +00:00 |
|
Scrutinizer Auto-Fixer
|
87585c0f2a
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 17:32:11 +00:00 |
|
Laurent Destailleur
|
6afc84fe72
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-11-12 10:20:55 +01:00 |
|
Laurent Destailleur
|
944a15d06b
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2019-11-12 10:20:16 +01:00 |
|
Laurent Destailleur
|
f8e8d15606
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-11-12 10:19:01 +01:00 |
|
Scrutinizer Auto-Fixer
|
c85e54b08c
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-12 08:46:08 +00:00 |
|
gauthier
|
e2680f7637
|
FIX : limit 20 prevent to see all products/services
|
2019-11-12 09:42:27 +01:00 |
|
Scrutinizer Auto-Fixer
|
038bda254d
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-11 22:59:36 +00:00 |
|
Philippe GRAND
|
d760b799d9
|
internationalization
|
2019-11-09 16:26:57 +01:00 |
|
Philippe GRAND
|
ab267cdf0c
|
internationalization
|
2019-11-09 16:23:06 +01:00 |
|
Philippe GRAND
|
1ac4bf54d2
|
internationalization
|
2019-11-09 16:16:16 +01:00 |
|
Philippe GRAND
|
0690467b15
|
internationalization
|
2019-11-09 16:11:37 +01:00 |
|
Philippe GRAND
|
86c826bd87
|
internationalization
|
2019-11-09 15:54:09 +01:00 |
|
Frédéric FRANCE
|
35751a80ab
|
100% centpercent
|
2019-11-05 21:24:41 +01:00 |
|
Laurent Destailleur
|
94bd0f71d9
|
Fix pb with permission
|
2019-11-05 19:41:30 +01:00 |
|
Laurent Destailleur
|
ce1dec253f
|
FIX #11364
|
2019-11-05 12:47:38 +01:00 |
|
Frédéric FRANCE
|
f81ac3a388
|
Update type.php
|
2019-11-04 22:57:46 +01:00 |
|
Frédéric FRANCE
|
b0d0e306d1
|
missing newtoken for csrf
|
2019-11-04 22:54:34 +01:00 |
|
Laurent Destailleur
|
1aef1c60dd
|
Merge pull request #11867 from frederic34/socialnetworks
NEW add socialnetworks dictionary
|
2019-11-04 21:10:22 +01:00 |
|
Laurent Destailleur
|
bdbec58461
|
Merge pull request #12309 from ptibogxiv/patch-274
NEW change duration membertype
|
2019-11-04 20:53:42 +01:00 |
|
Laurent Destailleur
|
11500fb8d9
|
FIX confusion between permto... and permisstionto...
|
2019-11-04 15:33:49 +01:00 |
|
Frédéric FRANCE
|
872f58f261
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-11-03 21:48:24 +01:00 |
|
stickler-ci
|
8007b22030
|
Fixing style errors.
|
2019-11-03 11:37:44 +00:00 |
|
ptibogxiv
|
44b80fdc44
|
Update type.php
|
2019-11-03 12:35:52 +01:00 |
|
ptibogxiv
|
871b6d9dd6
|
NEW change duration membertype
|
2019-11-03 12:35:05 +01:00 |
|
Laurent Destailleur
|
25e64b0610
|
Merge branch 'develop' into socid
|
2019-11-02 12:01:06 +01:00 |
|
Laurent Destailleur
|
f9031cdbfd
|
Clean code
|
2019-11-02 11:36:48 +01:00 |
|
Frédéric FRANCE
|
77d4ca81dc
|
Merge remote-tracking branch 'upstream/develop' into socid
|
2019-11-02 09:14:15 +01:00 |
|
Laurent Destailleur
|
cea2c3a9f4
|
Look and feel v11
|
2019-11-01 23:58:14 +01:00 |
|
Frédéric FRANCE
|
dbed10a701
|
Merge remote-tracking branch 'upstream/develop' into socid
|
2019-11-01 21:39:20 +01:00 |
|
Laurent Destailleur
|
e3b5be7475
|
All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed
into 'labelStatus'.
All properties 'labelstatusshort' and 'labelstatut_short' were renamed
into 'labelStatusShort'.
|
2019-11-01 12:52:03 +01:00 |
|
Frédéric FRANCE
|
e93aaa2a75
|
replace deprecated user->societe_id by user->socid
|
2019-10-31 20:46:31 +01:00 |
|
Frédéric FRANCE
|
f7747ed00a
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-30 20:06:43 +01:00 |
|
Laurent Destailleur
|
811a30c9c2
|
Merge pull request #12212 from frederic34/patch-3
Update adherent.class.php
|
2019-10-30 03:16:46 +01:00 |
|
Laurent Destailleur
|
58188423e2
|
Merge pull request #12227 from ptibogxiv/patch-272
Fix php error display
|
2019-10-30 03:10:02 +01:00 |
|
Frédéric FRANCE
|
d889d1ba7b
|
css
|
2019-10-25 18:20:48 +02:00 |
|
ptibogxiv
|
60f43a80c8
|
Fix php error display
|
2019-10-25 18:05:11 +02:00 |
|
Frédéric FRANCE
|
a43e6f96b5
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-25 08:12:54 +02:00 |
|
Frédéric FRANCE
|
833e761633
|
Update adherent.class.php
|
2019-10-24 16:35:48 +02:00 |
|
Laurent Destailleur
|
2eed48e091
|
Limit number of lines in statistics table
|
2019-10-24 15:16:26 +02:00 |
|
Laurent Destailleur
|
433f6918fd
|
Look and feel v11
|
2019-10-23 21:21:39 +02:00 |
|
Laurent Destailleur
|
7297514afb
|
NEW Use the gender of member for picto in member lists.
|
2019-10-23 21:00:29 +02:00 |
|
Laurent Destailleur
|
fd04729727
|
Fix tooltip on extrafield title was on wrong line.
|
2019-10-23 20:35:39 +02:00 |
|
Laurent Destailleur
|
b48f08dd07
|
Theme v11
|
2019-10-23 20:12:29 +02:00 |
|
Frédéric FRANCE
|
9ec7836387
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-20 16:37:18 +02:00 |
|
Frédéric FRANCE
|
360bf55f5b
|
clean indent
|
2019-10-20 01:09:11 +02:00 |
|
Frédéric FRANCE
|
f4540dddb8
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-17 20:24:04 +02:00 |
|
Frédéric FRANCE
|
e75f7d448c
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
|
2019-10-16 20:00:01 +02:00 |
|
Frédéric FRANCE
|
d9ba09bec1
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-12 19:02:24 +02:00 |
|
Frédéric FRANCE
|
9f59656589
|
fix typo inspired by grandoc
|
2019-10-11 23:08:33 +02:00 |
|
Frédéric FRANCE
|
f253315c8d
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-08 18:30:58 +02:00 |
|
Laurent Destailleur
|
3acf7211c3
|
Merge pull request #11847 from ptibogxiv/patch-257
NEW: Option to allow to create members from third-party
|
2019-10-08 15:08:34 +02:00 |
|
Frédéric FRANCE
|
b78187c1eb
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-08 00:07:27 +02:00 |
|
Laurent Destailleur
|
da5890e584
|
Update adherent.class.php
|
2019-10-07 20:32:51 +02:00 |
|
ptibogxiv
|
ff992d996c
|
Update type_translation.php
|
2019-10-07 13:37:35 +02:00 |
|
ptibogxiv
|
decbdaa5af
|
Rename traduction.php to type_translation.php
|
2019-10-07 13:35:40 +02:00 |
|
Laurent Destailleur
|
e02794248e
|
Merge branch 'develop' into patch-264
|
2019-10-07 13:25:16 +02:00 |
|
Laurent Destailleur
|
c2a7ae23bc
|
Merge pull request #12034 from aspangaro/11_faicon
Fix Fa-icon
|
2019-10-07 13:03:27 +02:00 |
|
Frédéric FRANCE
|
ec8569dd85
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-06 15:56:21 +02:00 |
|
Laurent Destailleur
|
866dcf18fe
|
Look and feel v11
|
2019-10-06 15:34:22 +02:00 |
|
Laurent Destailleur
|
2b66282b61
|
NEW Code for extrafields uses the new array $extrafields->attributes
|
2019-10-06 14:41:52 +02:00 |
|
Alexandre SPANGARO
|
ddadff5731
|
Add globe fa-icon
|
2019-10-03 21:32:55 +02:00 |
|
Frédéric FRANCE
|
98023353fe
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-03 17:21:31 +02:00 |
|
Sebastien Baguet
|
5dbf34a864
|
Small fix on a query
|
2019-10-03 13:34:47 +02:00 |
|
stickler-ci
|
09b423d14d
|
Fixing style errors.
|
2019-10-02 22:35:09 +00:00 |
|
Sebastien Baguet
|
9daffcbe07
|
Fix for no subscription members
|
2019-10-03 00:29:41 +02:00 |
|
Frédéric FRANCE
|
3afb4355a8
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-02 18:59:18 +02:00 |
|
Laurent Destailleur
|
d8a8c4fbe6
|
Look and feel v11. Picto are fontawesome.
|
2019-10-02 18:36:36 +02:00 |
|
Frédéric FRANCE
|
aca9d92db8
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-01 22:03:33 +02:00 |
|
Frédéric FRANCE
|
010b2723b6
|
work on migration script
|
2019-10-01 20:14:06 +02:00 |
|
Alexandre SPANGARO
|
16c6c9ae75
|
Merge remote-tracking branch 'upstream/develop' into 11.0_https
|
2019-10-01 06:12:24 +02:00 |
|
Alexandre SPANGARO
|
91b3bf76fd
|
Merge branch 'develop' into 11.0_https
|
2019-10-01 06:11:43 +02:00 |
|
Frédéric FRANCE
|
b87610adcc
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-09-30 19:34:35 +02:00 |
|
Laurent Destailleur
|
b28cd1bb57
|
Merge pull request #11972 from aspangaro/11.0_fa_icon
NEW Add fa_icon on load_fiche_titre
|
2019-09-30 15:26:28 +02:00 |
|
Alexandre SPANGARO
|
aec50d3ac9
|
NEW Add fa_icon on load_fiche_titre
|
2019-09-30 10:14:55 +02:00 |
|
Frédéric FRANCE
|
1b151da776
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-09-29 11:28:54 +02:00 |
|
Laurent Destailleur
|
db32ca99c6
|
Fix translation and sql request
|
2019-09-28 12:36:09 +02:00 |
|
Laurent Destailleur
|
86e5465197
|
Standardize extrafields code
|
2019-09-28 10:55:09 +02:00 |
|
Alexandre SPANGARO
|
288aea190b
|
Merge remote-tracking branch 'upstream/develop' into 11.0_fa_icon
|
2019-09-28 06:09:40 +02:00 |
|
Alexandre SPANGARO
|
7f93f046e9
|
NEW Add fa_icon on load_fiche_titre
|
2019-09-28 06:02:25 +02:00 |
|
Frédéric FRANCE
|
cea3669ffa
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-09-28 00:35:14 +02:00 |
|
Laurent Destailleur
|
6858dce344
|
Rename table for categorie of warehouses
|
2019-09-27 13:28:28 +02:00 |
|
Alexandre SPANGARO
|
e38bb89a2e
|
NEW Add fa_icon on load_fiche_titre
|
2019-09-27 11:48:40 +02:00 |
|
Alexandre SPANGARO
|
02dbc11f98
|
Move Gnu.org to https
|
2019-09-23 21:55:30 +02:00 |
|
Alexandre SPANGARO
|
1c13a38ce9
|
Typo abscissa
|
2019-09-23 21:45:23 +02:00 |
|
Alexandre SPANGARO
|
1e49fd0d45
|
Translate
|
2019-09-20 15:07:58 +02:00 |
|
Alexandre SPANGARO
|
e32772fdc5
|
Translate
|
2019-09-20 09:44:49 +02:00 |
|
Alexandre SPANGARO
|
278312f38f
|
Translate
|
2019-09-20 07:02:14 +02:00 |
|
Alexandre SPANGARO
|
b3807bbb20
|
Merge branch 'develop' into 11.0_translation
|
2019-09-19 22:34:43 +02:00 |
|
Alexandre SPANGARO
|
4819414d3a
|
Translate and some fix
|
2019-09-19 22:33:26 +02:00 |
|
stickler-ci
|
8d8ded324d
|
Fixing style errors.
|
2019-09-17 11:56:16 +00:00 |
|
ptibogxiv
|
a295d57e0c
|
Update adherent_type.class.php
|
2019-09-17 13:54:17 +02:00 |
|
ptibogxiv
|
c01ab4ab53
|
Update adherent_type.class.php
|
2019-09-17 13:53:34 +02:00 |
|
ptibogxiv
|
cff6da34df
|
Create traduction.php
|
2019-09-17 13:53:06 +02:00 |
|
Frédéric FRANCE
|
ccaa4cc1f3
|
work on contact
|
2019-09-14 16:35:18 +02:00 |
|
Frédéric FRANCE
|
af63ac4051
|
work on contact
|
2019-09-14 13:31:26 +02:00 |
|
Frédéric FRANCE
|
1cd59cc16a
|
work on user
|
2019-09-14 11:26:31 +02:00 |
|
Frédéric FRANCE
|
de3a67f5bd
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-09-12 21:52:06 +02:00 |
|
Frédéric FRANCE
|
cd109d04cd
|
add function
|
2019-09-12 20:44:24 +02:00 |
|
Frédéric FRANCE
|
fa44af1df8
|
work on user
|
2019-09-12 20:03:28 +02:00 |
|
Frédéric FRANCE
|
e4a0de245a
|
work on user
|
2019-09-12 18:41:26 +02:00 |
|
Laurent Destailleur
|
84e197e48a
|
Clean code
|
2019-09-12 00:09:49 +02:00 |
|
Frédéric FRANCE
|
dc2ea3cef9
|
add socialnetworks dictionary
|
2019-09-11 23:00:14 +02:00 |
|