stickler-ci
|
2849d00b4d
|
Fixing style errors.
|
2020-04-15 16:39:15 +00:00 |
|
ptibogxiv
|
f6174ddf4a
|
NEW API filter members by category
|
2020-04-15 18:37:20 +02:00 |
|
Laurent Destailleur
|
596ba8d679
|
Clean deprecated code.
|
2020-04-13 01:10:35 +02:00 |
|
Laurent Destailleur
|
4bfc900798
|
Look and feel v12
|
2020-04-12 18:41:42 +02:00 |
|
Laurent Destailleur
|
ecd49c21c9
|
Look and feel v12
|
2020-04-12 17:32:22 +02:00 |
|
Laurent Destailleur
|
d75f1138ba
|
Fix phpcs
|
2020-04-10 13:00:46 +02:00 |
|
Laurent Destailleur
|
0845f0bcd3
|
Merge pull request #13523 from bb2a/patch-2
add in default search
|
2020-04-10 12:12:28 +02:00 |
|
Scrutinizer Auto-Fixer
|
444c293c01
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-04-10 08:59:32 +00:00 |
|
Anthony Berton
|
8abef71616
|
Update list.php
|
2020-04-10 10:50:15 +02:00 |
|
Laurent Destailleur
|
4ff503d20a
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/product/stock/list.php
htdocs/supplier_proposal/list.php
|
2020-04-10 02:07:51 +02:00 |
|
Laurent Destailleur
|
7fe8c7eab3
|
FIX #11855
|
2020-04-10 01:37:04 +02:00 |
|
Laurent Destailleur
|
f1c391363d
|
Fix label
|
2020-04-09 18:40:00 +02:00 |
|
Laurent Destailleur
|
03b09f1d28
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-04-05 12:14:03 +02:00 |
|
Laurent Destailleur
|
e838000795
|
responsive
|
2020-04-05 12:11:58 +02:00 |
|
Laurent Destailleur
|
5b8c50cb72
|
css
|
2020-04-05 12:07:00 +02:00 |
|
Laurent Destailleur
|
5ca9c71449
|
css
|
2020-04-05 12:05:27 +02:00 |
|
Laurent Destailleur
|
98dfc7ca71
|
Fix css
|
2020-04-05 12:01:05 +02:00 |
|
Josep Lluís
|
d2e35fc1f7
|
NEW: add addlinktonotes in members list
|
2020-04-02 17:49:01 +02:00 |
|
Laurent Destailleur
|
99ddd25ad5
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/product/stock/class/mouvementstock.class.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
|
2020-04-02 16:51:50 +02:00 |
|
Laurent Destailleur
|
6f0071bebe
|
FIX sort on company on member list
|
2020-03-31 17:54:48 +02:00 |
|
Laurent Destailleur
|
a5379c7144
|
FIX All forms must use newToken()
Conflicts:
htdocs/commande/card.php
htdocs/compta/cashcontrol/cashcontrol_card.php
htdocs/supplier_proposal/card.php
|
2020-03-24 13:14:23 +01:00 |
|
Laurent Destailleur
|
1ff15e1fd9
|
FIX All forms must use newToken()
|
2020-03-24 13:10:35 +01:00 |
|
Laurent Destailleur
|
820a21a721
|
Simple setup tutorial
|
2020-03-23 18:35:22 +01:00 |
|
Scrutinizer Auto-Fixer
|
e8083e2a65
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-03-23 14:54:02 +00:00 |
|
Laurent Destailleur
|
8bab245c7e
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
htdocs/core/tpl/contacts.tpl.php
|
2020-03-18 18:50:55 +01:00 |
|
Laurent Destailleur
|
8192e9dc67
|
FIX Missing token in form
|
2020-03-14 03:02:49 +01:00 |
|
Laurent Destailleur
|
33c5db9cc3
|
Prepare code for the new pagination possibility
|
2020-03-13 13:07:11 +01:00 |
|
Scrutinizer Auto-Fixer
|
f413ce6aac
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-03-12 11:45:44 +00:00 |
|
Laurent Destailleur
|
6ce6dc145f
|
Use colors of status in donut
|
2020-03-12 02:20:31 +01:00 |
|
Laurent Destailleur
|
0bd2740779
|
NEW Can force position of legend of graph on right (instead of top)
|
2020-03-05 17:23:19 +01:00 |
|
Laurent Destailleur
|
fc31680bd0
|
Several fix for chart.js graphs
|
2020-03-05 02:55:06 +01:00 |
|
Laurent Destailleur
|
74fa8d90e7
|
Use status of member colors into pie chart
|
2020-03-05 01:38:41 +01:00 |
|
Laurent Destailleur
|
a6d340a22c
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/filefunc.inc.php
|
2020-03-04 19:28:15 +01:00 |
|
Laurent Destailleur
|
deda6252f2
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/core/lib/functions.lib.php
htdocs/expensereport/class/expensereport.class.php
|
2020-03-04 19:22:30 +01:00 |
|
ptibogxiv
|
060df57cb1
|
FIX: fk_type subscription list via api REST
v10 to dev
|
2020-03-03 11:58:15 +01:00 |
|
Laurent Destailleur
|
7431bf0592
|
Try formating profile
|
2020-02-24 22:53:14 +01:00 |
|
Laurent Destailleur
|
b52f458517
|
Clean code
|
2020-02-24 22:20:15 +01:00 |
|
Laurent Destailleur
|
3075e40f8c
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/comm/remx.php
htdocs/core/boxes/box_contacts.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/security.lib.php
|
2020-02-23 23:37:46 +01:00 |
|
Laurent Destailleur
|
11ff3f6562
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2020-02-23 23:31:03 +01:00 |
|
gmilad
|
559fc9f61e
|
Update note.php
Fix : #13168
|
2020-02-22 13:07:25 +01:00 |
|
gmilad
|
6264f78e39
|
Update note.php
Bonsoir,
Correction pour l'issue #13168
Cordialement,
Gaëtan.
|
2020-02-21 23:01:16 +01:00 |
|
Scrutinizer Auto-Fixer
|
e44865d8b5
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-02-21 16:53:37 +00:00 |
|
Laurent Destailleur
|
f4f3efec62
|
Fight against $_POST
|
2020-02-16 19:33:58 +01:00 |
|
Laurent Destailleur
|
9e165a782f
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-02-13 11:58:23 +01:00 |
|
Laurent Destailleur
|
e511deb8e7
|
FIX #13096
|
2020-02-13 11:39:08 +01:00 |
|
Laurent Destailleur
|
4762bafb02
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/adherents/subscription/list.php
htdocs/mrp/class/mo.class.php
|
2020-02-12 22:58:37 +01:00 |
|
Laurent Destailleur
|
ccced09113
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/adherents/subscription/list.php
htdocs/comm/propal/list.php
htdocs/core/class/html.formmail.class.php
|
2020-02-12 22:54:55 +01:00 |
|
Laurent Destailleur
|
66493672eb
|
Clean code
|
2020-02-12 15:20:37 +01:00 |
|
Laurent Destailleur
|
2dafbe0f91
|
Fix labels
|
2020-02-12 15:19:42 +01:00 |
|
Alexandre SPANGARO
|
c77169ad87
|
FIX : Problem with column label in subscription list
|
2020-02-10 16:01:09 +01:00 |
|
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 |
|
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 |
|