Laurent Destailleur
67a7d6b77d
Look and feel v12
2020-04-20 15:57:15 +02:00
Laurent Destailleur
16e46c672c
Clean code
2020-04-20 15:06:27 +02:00
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
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
Frédéric FRANCE
3fddef0c9e
add socialnetworks dictionary
2019-09-11 22:27:09 +02:00
Laurent Destailleur
61cf47aa16
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-09-10 00:14:07 +02:00
Laurent Destailleur
c7bab8681a
Fix sql error #11845
2019-09-09 13:05:08 +02:00
Laurent Destailleur
1d74387125
Removed deprecated property ->numero (We must use ->num_payment)
2019-09-09 08:47:23 +02:00
ptibogxiv
a83c067081
Update card.php
2019-09-08 20:08:32 +02:00
ptibogxiv
2d3b0a7d43
Update adherent.class.php
2019-09-08 20:05:13 +02:00
Alexandre SPANGARO
3a8d8ee902
FIX #11401 Adherent unknown language key
2019-09-08 03:56:01 +02:00
Laurent Destailleur
529dd05226
Replace deprecated code
2019-09-06 10:53:05 +02:00
Laurent Destailleur
7c3b0e98c4
Fix deprecated property
2019-09-02 13:53:16 +02:00
Laurent Destailleur
7438eecc64
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/type.php
2019-09-02 04:41:43 +02:00
Laurent Destailleur
42defc31bd
FIX Look and feel v10
2019-09-02 04:39:41 +02:00
Laurent Destailleur
dbdafb86f4
FIX Look and feel v10
2019-09-02 04:38:01 +02:00
Laurent Destailleur
ac7d0b5eb6
Fix scrutinizer
2019-09-02 04:12:48 +02:00
Laurent Destailleur
92799902b6
Fix var null
2019-09-02 03:44:34 +02:00
Laurent Destailleur
64ebbec966
Fix deprecated code
2019-09-02 03:43:24 +02:00
Laurent Destailleur
733c90956f
Fix phpunit
2019-09-02 03:40:09 +02:00
Laurent Destailleur
97a1a47266
Change deprecated properties with new name
2019-09-01 22:21:48 +02:00
Laurent Destailleur
f6c2fb77ae
Fix scrutinizer
2019-09-01 22:02:48 +02:00
Laurent Destailleur
26fb5d34c4
Fix scturinizer
2019-09-01 21:53:42 +02:00
Laurent Destailleur
e57b4a8bda
Fix cast
2019-08-31 13:22:02 +02:00
Laurent Destailleur
2f49fc6a7b
Fix scrutinizer
2019-08-31 02:49:54 +02:00
Laurent Destailleur
48db5c2a44
Replace deprecated actioncomm->note into actioncomm->note_private
2019-08-31 02:46:39 +02:00
Laurent Destailleur
d5328d1cec
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-27 15:43:19 +02:00
Laurent Destailleur
478b1fea25
FIX #11711
2019-08-27 15:06:50 +02:00
John Botella
b4c4e5a662
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_dashboard
2019-08-02 14:52:01 +02:00
Laurent Destailleur
0bc90d81c8
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-02 12:05:12 +02:00
Laurent Destailleur
c01ac05aec
FIX Content of email for subscription
2019-08-02 12:04:06 +02:00
Laurent Destailleur
d7a41c6b72
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/admin.lang
2019-08-01 12:54:27 +02:00
John Botella
9b84987cc1
prepare new dashboard
2019-08-01 12:33:19 +02:00
Laurent Destailleur
5eb8f05061
FIX #11584
2019-08-01 12:23:02 +02:00
Laurent Destailleur
34f78c555d
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-30 20:55:35 +02:00
Alexandre SPANGARO
cededd97d2
FIX Language key
2019-07-29 08:52:08 +02:00
Alexandre SPANGARO
7a9f2b43c5
FIX Language key
2019-07-29 07:05:18 +02:00
Laurent Destailleur
cf00ae971a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-15 22:45:29 +02:00
Laurent Destailleur
b0d46d492f
FIX #11509
2019-07-15 18:40:42 +02:00
Laurent Destailleur
adfbd62f8b
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-14 00:44:35 +02:00
Laurent Destailleur
251d501c8e
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-07-14 00:32:46 +02:00
Laurent Destailleur
2a05164bb1
FIX Better PHP compatibility
2019-07-14 00:31:28 +02:00
Laurent Destailleur
e0095871aa
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/compta/stats/byratecountry.php
htdocs/core/class/html.form.class.php
2019-07-14 00:19:56 +02:00
Laurent Destailleur
8090a8abb6
Fix param [] -> null
2019-07-14 00:07:27 +02:00
Regis Houssin
4dab57b494
FIX phpcs
2019-07-13 11:24:25 +02:00
Regis Houssin
b7df4a2cd0
FIX this function can not be private
2019-07-13 11:21:07 +02:00
Laurent Destailleur
0a7d70829f
Translation of some comments
2019-07-05 21:37:25 +02:00
Laurent Destailleur
06b3f6a62f
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/subscription/list.php
2019-06-25 13:03:54 +02:00
Laurent Destailleur
fa476b4994
Properties ->libelle_incoterms were renamed into ->label_incoterms
2019-06-25 13:00:02 +02:00
Laurent Destailleur
b6ad78fdd9
Fix sort
2019-06-25 11:25:36 +02:00
Laurent Destailleur
5031b6c06b
Fix bad id
2019-06-25 11:18:31 +02:00
Laurent Destailleur
5f17cfe462
Fix bad id
2019-06-25 11:09:13 +02:00
Laurent Destailleur
27be93f535
Fix bad id
2019-06-25 11:08:42 +02:00
Laurent Destailleur
4ed2db6d21
Fix bad id
2019-06-25 11:08:14 +02:00
Laurent Destailleur
e6b643e073
Fix syntax error
2019-06-25 11:07:14 +02:00
Laurent Destailleur
36f1527f76
Fix backward compatibility for type of members
2019-06-25 11:06:10 +02:00
Laurent Destailleur
ca3988ca73
Fix backward compatibility for type of members
2019-06-25 10:58:44 +02:00
Laurent Destailleur
732fd8a04b
Fix look and feel v10
2019-06-25 10:28:58 +02:00
Laurent Destailleur
74f61b3b9a
Fix status not loaded
2019-06-25 10:23:30 +02:00
Laurent Destailleur
7de0f5c0be
NEW Avoid wrap between picto and text on getNomUrl
2019-06-25 10:22:39 +02:00
Laurent Destailleur
6b8262bd8f
Fix status not loaded
2019-06-25 10:12:24 +02:00
Laurent Destailleur
366efff633
Merge pull request #11107 from gentooza/develop
...
NEW adding 'formObjectOptions' hooks loading at card.php of adherents module
2019-06-24 19:20:36 +02:00
Laurent Destailleur
c3a109d790
Update card.php
2019-06-24 19:20:27 +02:00
Laurent Destailleur
604633afd1
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-24 18:45:15 +02:00
Laurent Destailleur
57140b79dc
Restore official text of licence
2019-06-24 18:30:07 +02:00
Laurent Destailleur
35c3eb0d7e
Fix conflict in a translation key
2019-06-24 17:59:00 +02:00
Laurent Destailleur
3c4956838e
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/core/tpl/massactions_pre.tpl.php
2019-06-24 15:44:44 +02:00
Philippe GRAND
72c8316eb0
all http addresses should be https now
2019-06-24 09:39:58 +02:00
Laurent Destailleur
efa09301b1
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-22 20:19:14 +02:00
Laurent Destailleur
71b266b5a8
Code comment
2019-06-22 19:20:01 +02:00
Laurent Destailleur
5675e7c50e
Clean code of deprecated method
2019-06-22 18:19:40 +02:00
John Botella
ec7ebe9f39
redo backported fix and update adherent substitution methode
2019-06-21 15:32:38 +02:00
Laurent Destailleur
4308f48cad
Merge branch 'develop' into MissingHook
2019-06-20 03:04:32 +02:00
Laurent Destailleur
bf71731fc9
Fix phpcs
2019-06-19 22:28:33 +02:00
Nicolas ZABOURI
b6bd4119d9
FIX travis Public underscore in load_ldap_info
2019-06-19 09:12:01 +02:00
Nicolas ZABOURI
2e4db8c83c
Merge remote-tracking branch 'Dolibarr/10.0' into MissingHook
2019-06-19 08:39:05 +02:00
Laurent Destailleur
525598f6aa
Fix scrutinizer warnings
2019-06-18 20:01:28 +02:00
Nicolas ZABOURI
492c3b5625
FIX hook
2019-06-18 15:13:08 +02:00
ICstage
820c420ae5
FIX Missing hooks
2019-06-18 14:07:52 +02:00
florian HENRY
cab91e75c6
add missing column adherent list
2019-06-10 10:10:16 +02:00
ptibogxiv
63e205c23f
FIX term of lang for explicit date in subscription list
2019-06-07 15:15:05 +02:00
Laurent Destailleur
2218994958
FIX Duplicate encoding on error message
2019-05-29 09:51:45 +02:00
Laurent Destailleur
e8ba312d2a
Fix phpcs
2019-05-23 14:25:16 +02:00
Laurent Destailleur
aa93e1c07b
Merge pull request #11221 from frederic34/patch-6
...
The method _load_ldap_dn() cannot be called...
2019-05-21 22:39:15 +02:00
Laurent Destailleur
c1a0e9385f
Merge pull request #11219 from frederic34/patch-2
...
dol_print_object_info return void
2019-05-21 22:38:39 +02:00
Laurent Destailleur
22e897b1a1
Clean and prepare code to fix a SQL injection
2019-05-21 17:22:38 +02:00
Frédéric FRANCE
a368a6a43e
Update adherent_type.class.php
2019-05-19 11:52:34 +02:00
Frédéric FRANCE
a09584ae4b
The method _load_ldap_dn() cannot be called...
...
The method _load_ldap_dn() cannot be called from this context as it is declared private in class AdherentType.
2019-05-19 09:46:47 +02:00
Frédéric FRANCE
06421c200d
Update agenda.php
2019-05-19 09:13:46 +02:00
Laurent Destailleur
a9e96031de
Fix phpcs
2019-05-18 17:04:37 +02:00
Laurent Destailleur
1ad2c09800
Fix size of popup
2019-05-18 16:38:52 +02:00
Laurent Destailleur
5f598b1c3f
Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop
2019-05-18 16:26:03 +02:00
Laurent Destailleur
b40eb92ce7
Mass action for closing members
2019-05-18 16:25:45 +02:00
Laurent Destailleur
11fea03074
Merge pull request #11026 from atm-john/new_look_and_feel_title_button
...
NEW : look and feel title button
2019-05-18 16:04:47 +02:00
John BOTELLA
b0e780fab0
Fix travis
2019-05-13 09:39:45 +02:00
Laurent Destailleur
d789004782
Update adherent.class.php
2019-05-09 15:35:55 +02:00
ptibogxiv
3ddd5110ef
Update adherent.class.php
2019-05-09 13:42:32 +02:00
Joaquín
9c69c8acc7
trying to pass travis check
2019-05-04 12:08:28 +02:00
Joa
01ea4c28cf
adding hooks loading for form customization to card.php of adherents module
2019-05-03 11:02:37 +02:00
Laurent Destailleur
553d97d290
Merge pull request #11077 from ptibogxiv/patch-159
...
FIX: dolibarrize civility for fetch member
2019-05-02 12:40:51 +02:00
Laurent Destailleur
590c6fb91f
Update adherent.class.php
2019-05-02 12:40:34 +02:00
ptibogxiv
f33b7fc744
Update adherent.class.php
2019-04-27 15:19:39 +02:00
ptibogxiv
d8d462e36f
FIX: dolibarrize civility for fetch member
...
same code as contact or other object
2019-04-27 14:53:14 +02:00
ptibogxiv
423c5c3ac8
Update card.php
2019-04-26 14:26:50 +02:00
ptibogxiv
9b9295ab50
Update adherent.class.php
2019-04-26 14:25:58 +02:00
ptibogxiv
3e02dc2465
FIX : dolibarrize fk_soc ->socid for member
2019-04-26 13:23:30 +02:00
Laurent Destailleur
1dd8d9fa8f
Fix phpcs
2019-04-25 21:48:35 +02:00
Laurent Destailleur
ad50aa2e79
Merge pull request #11070 from ptibogxiv/patch-156
...
Fix display type in subscription list
2019-04-25 19:02:25 +02:00
Laurent Destailleur
4353925d95
Update subscription.php
2019-04-25 19:02:16 +02:00
ptibogxiv
2968921f87
Fix display type in subscription
2019-04-25 13:12:33 +02:00
ptibogxiv
cb658dda8c
Fix morphy type adherent
2019-04-25 12:04:26 +02:00
ptibogxiv
65bb7d9031
Update adherent_type.class.php
2019-04-25 09:37:07 +02:00
ptibogxiv
6190e7813e
Fix get morphy adherent type
2019-04-25 09:14:51 +02:00
Laurent Destailleur
6884999ee3
Merge pull request #10925 from ptibogxiv/patch-146
...
NEW morphy value in member type
2019-04-25 03:00:25 +02:00
ptibogxiv
0583cf7804
Update adherent_type.class.php
2019-04-24 15:44:57 +02:00
ATM john
684879d73c
apply appli btn to more elements
2019-04-16 21:49:26 +02:00
John BOTELLA
a60d4b3b52
Appli btn apply to links
2019-04-16 09:09:25 +02:00
John BOTELLA
7372e8c610
Appli function to links
2019-04-15 15:47:36 +02:00
Laurent Destailleur
2765cee005
CSS
2019-04-09 19:36:56 +02:00
Laurent Destailleur
d7f980fda0
NEW Add picto of deletion on mass action combo lists
2019-04-09 01:22:59 +02:00
Laurent Destailleur
fff9b7db9d
Fix doxygen
2019-04-04 18:33:12 +02:00
ptibogxiv
abd8dca3ea
Update api_memberstypes.class.php
2019-04-01 20:26:04 +02:00
ptibogxiv
2da9cfbbe4
Update api_memberstypes.class.php
2019-04-01 20:25:37 +02:00
Laurent Destailleur
c7e4cd7fa1
More complete examples
2019-04-01 18:39:36 +02:00
Laurent Destailleur
1b2826f476
Look and feel v10
2019-03-29 13:26:26 +01:00
ptibogxiv
22ea6fa0ab
Update api_memberstypes.class.php
2019-03-27 14:04:13 +01:00
ptibogxiv
7a84cb1fc8
Update type.php
2019-03-27 14:03:37 +01:00
ptibogxiv
fa302db84f
Update adherent_type.class.php
2019-03-27 12:48:18 +01:00
ptibogxiv
2e9badd21d
Update api_memberstypes.class.php
2019-03-27 12:45:33 +01:00
ptibogxiv
aa28079e78
NEW morphy value in member type
...
add value: mor / phy / both(aka null)
2019-03-27 12:42:31 +01:00
Laurent Destailleur
f27f65e8bf
Responsive
2019-03-25 10:09:02 +01:00
Laurent Destailleur
1b558d70c1
Fix menu translation
2019-03-22 12:42:23 +01:00
Philippe GRAND
e2e77f2a53
update with html5 compliant code
2019-03-19 14:15:24 +01:00
Philippe GRAND
ab267497ce
update with html5 compliant code
2019-03-19 14:13:51 +01:00
Philippe GRAND
5775d84a7f
update with html5 compliant code
2019-03-19 14:13:21 +01:00
Philippe GRAND
5073e75b4a
update with html5 compliant code
2019-03-19 14:12:12 +01:00
Philippe GRAND
e8430ca586
update with html5 compliant code
2019-03-19 14:06:54 +01:00
Philippe GRAND
36d8976439
update with html5 compliant code
2019-03-19 13:58:09 +01:00
Philippe GRAND
33b7965741
update with html5 compliant code
2019-03-19 13:57:08 +01:00
Philippe GRAND
4cde2085ea
update with html5 compliant code
2019-03-19 13:53:48 +01:00
Philippe GRAND
00d9efcdd2
update with html5 compliant code
2019-03-19 13:53:04 +01:00
Philippe GRAND
b2e3b53885
update with html5 compliant code
2019-03-19 13:51:59 +01:00
Philippe GRAND
2ffca034ee
update with html5 compliant code
2019-03-19 13:51:19 +01:00
Philippe GRAND
a5e1a0e1dd
update with html5 compliant code
2019-03-19 13:50:36 +01:00
Philippe GRAND
ddf2e90bb1
Merge remote-tracking branch 'upstream/develop' into new_branch_19_03_2019
2019-03-19 13:49:06 +01:00
Philippe GRAND
e5fc3d700c
update with html5 compliant code
2019-03-19 13:48:39 +01:00
Frédéric FRANCE
544934f322
phpcs fix
2019-03-19 12:48:44 +01:00
Philippe Grand
4935aa2fe4
Update adherent.class.php
2019-03-18 12:25:35 +01:00
Philippe GRAND
609dc5360b
add comments
2019-03-18 12:19:56 +01:00
Philippe GRAND
905f7cf8dd
add comments
2019-03-18 10:22:20 +01:00
Laurent Destailleur
e5567c7ee4
Fix typo
2019-03-16 14:48:41 +01:00
Laurent Destailleur
f0796d152f
Responsive
2019-03-15 20:23:34 +01:00
Laurent Destailleur
b6cacf3a20
Fix label of status for members on smartphone
2019-03-15 20:18:35 +01:00
Laurent Destailleur
bede7b80a2
Fix smartphone
2019-03-15 20:09:42 +01:00
Laurent Destailleur
04424ed882
FIX Bad label of status for members (must be short version in list)
...
Conflicts:
htdocs/adherents/class/adherent.class.php
2019-03-15 20:07:42 +01:00
Laurent Destailleur
af6508b1c8
FIX Bad label of status for members (must be short version in list)
2019-03-15 20:06:05 +01:00
Laurent Destailleur
6daa262779
Files for variables of themes were renamed from graph-color.php into
...
theme_vars.inc.php to match naming convention of extension .inc.php for
files to be included.
2019-03-11 20:32:25 +01:00
Laurent Destailleur
37d692918b
CSS
2019-03-10 20:59:50 +01:00
Laurent Destailleur
b710e28ffa
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/admin/adherent.php
htdocs/admin/barcode.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/langs/en_US/admin.lang
2019-03-09 01:20:13 +01:00
Laurent Destailleur
1a96a7a88f
FIX More complete auto setup of barcode module
...
Add tooltip help on member setup module
2019-03-08 11:31:12 +01:00
Laurent Destailleur
ddc52b7199
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/tpl/objectline_create.tpl.php
htdocs/exports/export.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/fourn/facture/card.php
2019-03-07 14:13:38 +01:00
Laurent Destailleur
a0bc6672d8
Try to avoid to make subquery when not necessary
2019-03-07 12:43:17 +01:00
Laurent Destailleur
f54eb78260
NEW Show the latest date of subscription in member statistics reports
2019-03-07 12:22:24 +01:00
Timoté Fallais
c31318f29d
Update libelle of user (making Mailman working correctly)
2019-03-07 09:15:43 +01:00
Frédéric FRANCE
f283782445
change visibility
2019-03-04 19:57:46 +01:00
ptibogxiv
dd172f04d5
Fixe date on fetch adherent.class.php
2019-03-03 21:51:32 +01:00
Laurent Destailleur
8fce6e5e31
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/card.php
htdocs/core/modules/mailings/xinputfile.modules.php
htdocs/fourn/facture/card.php
2019-03-02 19:13:37 +01:00
Laurent Destailleur
4f9981063f
Merge branch 'Squiz.Scope.MethodScope.Missing' of https://github.com/frederic34/dolibarr into frederic34-Squiz.Scope.MethodScope.Missing
2019-03-02 18:26:50 +01:00
Laurent Destailleur
56d921ea52
CSS
2019-03-02 12:57:07 +01:00
Laurent Destailleur
429da47d68
Fix default language of reminders
2019-02-28 13:11:14 +01:00
Frédéric FRANCE
089875b8a2
add visibility
2019-02-27 17:53:52 +01:00
Frédéric FRANCE
5a4ac82880
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing
2019-02-27 08:23:29 +01:00
Alexandre SPANGARO
2da1447a0b
Merge remote-tracking branch 'upstream/develop' into 10.0_linkedin
2019-02-25 09:12:04 +01:00
Alexandre SPANGARO
acb9cfe07a
NEW: Add LinkedIn field
2019-02-25 09:07:58 +01:00
Frédéric FRANCE
42a1387218
wip
2019-02-25 00:56:48 +01:00
Laurent Destailleur
e4698fb6a5
Merge
2019-02-18 19:14:25 +01:00
Laurent Destailleur
b44acd177b
Fix right style
2019-02-15 02:01:17 +01:00
Laurent Destailleur
31e9fd46a4
Merge
2019-02-14 20:59:31 +01:00
Laurent Destailleur
e6e18ff616
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/menus/edit.php
htdocs/product/stock/card.php
htdocs/product/stock/info.php
htdocs/product/stock/movement_list.php
2019-02-14 15:33:17 +01:00
Laurent Destailleur
fabdf05f6f
Fix field date subscription not visible
2019-02-14 09:57:33 +01:00
Frédéric FRANCE
af3adcecb0
first parameter of print_liste_field_titre was translated
2019-02-10 15:48:53 +01:00
Frédéric FRANCE
1e43f8e54a
PEAR FunctionCallSignature
2019-02-10 10:45:49 +01:00
Laurent Destailleur
af92303319
Merge pull request #10487 from frederic34/psr2squizwhite
...
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
2019-02-08 09:30:25 +01:00
Laurent Destailleur
9e28db4202
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/tools/export.php
2019-02-06 00:51:10 +01:00
Laurent Destailleur
ce5717a7b7
FIX Default language of company is not set
2019-02-05 20:43:26 +01:00
Laurent Destailleur
82df83cec2
Add log
2019-02-05 20:04:25 +01:00
Laurent Destailleur
27f804a454
Fix currency
2019-02-05 19:59:36 +01:00
Laurent Destailleur
d4e6610722
Fix currency
2019-02-05 19:58:42 +01:00
Laurent Destailleur
5a659bfd90
Fix Missing currency
2019-02-05 19:57:35 +01:00
Frédéric FRANCE
970392adb8
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
2019-02-03 22:41:57 +01:00
Laurent Destailleur
57f81217ee
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/localtax/index.php
htdocs/compta/tva/index.php
2019-02-03 21:14:44 +01:00
Laurent Destailleur
4d41b1b33c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-02-03 19:45:45 +01:00
Laurent Destailleur
62d677118d
Update adherent.class.php
2019-02-03 19:24:18 +01:00
Frédéric FRANCE
80a12fcd1c
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
2019-02-03 14:29:45 +01:00
Frédéric FRANCE
f5b2cf75f2
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-02-01 18:31:44 +01:00
Laurent Destailleur
affdc08848
Merge branch 'develop' into new_branch_30_01_2019
2019-02-01 15:54:36 +01:00
Laurent Destailleur
a993b9e335
Merge pull request #10468 from grandoc/new_branch_31_01_2019
...
update with html5 compliant code
2019-02-01 15:35:20 +01:00
Laurent Destailleur
eb3621839a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/members.lang
htdocs/langs/fr_FR/members.lang
2019-02-01 15:14:19 +01:00
Laurent Destailleur
a0c0b377b2
css
2019-01-31 20:53:47 +01:00
Laurent Destailleur
c05628c746
Fix edit member module setup
2019-01-31 20:27:55 +01:00
Philippe GRAND
c5bbaa4aa3
fix translation
2019-01-31 15:15:18 +01:00
Philippe GRAND
7cf51a5e35
fix translation
2019-01-31 14:05:55 +01:00
gauthier
bfc7265cbc
FIX : better test on fetch
2019-01-31 11:53:10 +01:00
Philippe GRAND
d9ce99a314
update with html5 compliant code
2019-01-30 19:41:56 +01:00
Laurent Destailleur
648eea3a70
Merge branch 'develop' into nospaceaftercomma
2019-01-30 16:00:11 +01:00
Alexandre SPANGARO
cc88c4f8ff
Move my email to the new one
2019-01-28 21:39:22 +01:00
Frédéric FRANCE
baf274af29
wip
2019-01-27 23:51:57 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-27 23:23:38 +01:00
Laurent Destailleur
c467625781
Merge pull request #10429 from frederic34/patch-17
...
do not trim int, use cast
2019-01-27 18:00:52 +01:00
Laurent Destailleur
4f9f0fd7b5
Merge branch 'develop' into elseif
2019-01-27 17:54:06 +01:00
Frédéric FRANCE
f0cdf300d1
Squiz.Functions.FunctionDeclarationArgumentSpacing
2019-01-27 15:20:16 +01:00
Frédéric FRANCE
ac63a7b6b5
do not trim int, use cast
2019-01-27 14:30:23 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc
PSR2 usage of else if is discouraged
2019-01-27 10:49:34 +01:00
ptibogxiv
a0142a73a5
Update type.php
2019-01-24 19:30:36 +01:00
ptibogxiv
2aa2cd331e
Update type.php
2019-01-24 19:26:36 +01:00
ptibogxiv
7197f43c3a
manage statut type
2019-01-24 19:23:01 +01:00
ptibogxiv
634810b8b3
NEW conditionnal add member button by statut
2019-01-24 18:40:41 +01:00
Philippe GRAND
be97ad0e3e
update with html5 compliant code
2019-01-21 22:04:42 +01:00
Philippe GRAND
7734c4f61b
update with html5 compliant code
2019-01-21 22:02:11 +01:00
Laurent Destailleur
f53232e2f9
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-21 02:56:32 +01:00
Laurent Destailleur
7f8b710edc
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-01-21 02:52:24 +01:00
Frédéric FRANCE
077b9f1996
get_codeclient return void
...
1ac55b0800/htdocs/societe/class/societe.class.php (L2421-L2441)
2019-01-20 15:23:48 +01:00
Philippe GRAND
ef7ec5555c
update with html5 compliant code
2019-01-19 12:23:58 +01:00
Laurent Destailleur
b0b7f53994
Merge pull request #10362 from ptibogxiv/patch-87
...
NEW save and display type of adherent in subscription for more explicit historic
2019-01-19 11:22:41 +01:00
ptibogxiv
4be8d8a945
FIX lang libelle in list.php
2019-01-17 20:01:28 +01:00
ptibogxiv
b05f6d82fa
Update subscription.class.php
2019-01-17 19:38:19 +01:00
Laurent Destailleur
58bda12e22
css
2019-01-17 19:31:01 +01:00
ptibogxiv
1a10d8f702
FIX loadLangs in subscription list.php
...
for v9 et develop
2019-01-17 19:19:55 +01:00
ptibogxiv
3deec2c8c8
Update card.php
2019-01-17 18:58:08 +01:00
ptibogxiv
2f36354c8d
Update list.php
2019-01-17 18:09:25 +01:00
ptibogxiv
6514423561
Update card.php
2019-01-17 18:08:14 +01:00
ptibogxiv
f6eebf0ed5
Update card.php
2019-01-17 17:48:13 +01:00
ptibogxiv
7ebf3967cb
Update subscription.class.php
2019-01-17 17:45:52 +01:00
ptibogxiv
829807b467
modify class to display save adherent type in subscription
2019-01-17 17:38:46 +01:00
ptibogxiv
65189aa4f0
display / update adherent type
2019-01-17 17:37:39 +01:00
ptibogxiv
5e47f17cd7
Display fk_type in subscription
2019-01-17 17:36:14 +01:00
ptibogxiv
639e8e4104
FIX loadLangs in subscription list.php
...
for v9 et develop
2019-01-17 16:25:35 +01:00
Philippe GRAND
8418c25bcb
update with html5 compliant code
2019-01-17 14:04:16 +01:00
Philippe GRAND
badc3d6af9
update with html5 compliant code
2019-01-17 14:01:21 +01:00
Laurent Destailleur
e7943ae844
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-16 16:48:52 +01:00
Laurent Destailleur
d3828130ab
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/adherents/class/adherent.class.php
2019-01-16 16:48:21 +01:00
Laurent Destailleur
698222c769
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/adherents/subscription.php
2019-01-16 16:45:30 +01:00
Laurent Destailleur
6becdc8af4
Fix missing substitution of ID
2019-01-16 16:34:36 +01:00
Laurent Destailleur
5d0ff28556
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/societe/card.php
2019-01-08 01:56:03 +01:00
Laurent Destailleur
d2f6899346
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/admin/defaultvalues.php
htdocs/societe/card.php
2019-01-08 01:53:00 +01:00
Laurent Destailleur
9d8b084115
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
ChangeLog
htdocs/core/actions_sendmails.inc.php
htdocs/filefunc.inc.php
2019-01-08 01:48:54 +01:00
Xebax
2c496d2ac0
FIX Civility not saved when creating a member.
2019-01-06 13:42:41 +01:00
Laurent Destailleur
d455cad724
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-12-27 21:31:52 +01:00
Laurent Destailleur
9842f50942
Fix substitution for members
2018-12-27 21:16:33 +01:00
Laurent Destailleur
5c516fdae2
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
2018-12-26 19:43:01 +01:00
Laurent Destailleur
85375495e5
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/product/class/product.class.php
htdocs/public/notice.php
htdocs/user/card.php
2018-12-22 19:06:58 +01:00
Laurent Destailleur
0f06e39d23
FIX CVE-2018-19992
2018-12-22 16:55:31 +01:00
Philippe GRAND
27facab545
fix typo and translation
2018-12-20 14:18:22 +01:00
Philippe GRAND
c3a898daa6
better form display and fix
2018-12-20 13:44:49 +01:00
Laurent Destailleur
44a6644969
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-12-18 21:55:53 +01:00
Laurent Destailleur
89068ffef1
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/adherents/subscription.php
htdocs/core/class/commonobject.class.php
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
htdocs/langs/es_ES/companies.lang
htdocs/langs/es_ES/errors.lang
htdocs/product/stock/product.php
htdocs/user/card.php
2018-12-18 21:55:14 +01:00
Laurent Destailleur
4b6ae9d424
FIX Error reported when creation of thirdparty from member fails
...
Conflicts:
htdocs/adherents/subscription.php
htdocs/core/class/commonobject.class.php
2018-12-18 21:32:41 +01:00
Laurent Destailleur
b8429c607e
FIX Can't create a thirdparty from member if customer code is mandatory.
2018-12-18 21:29:53 +01:00
Laurent Destailleur
f2318716ec
FIX Error reported when creation of thirdparty from member fails
2018-12-18 21:27:16 +01:00
Laurent Destailleur
31d032d5d3
FIX Can't create a thirdparty from member if customer code is mandatory.
2018-12-18 21:00:06 +01:00
Laurent Destailleur
2b6269a162
Merge pull request #10171 from hregis/develop_bug
...
FIX scrutinizer
2018-12-15 15:44:27 +01:00
Laurent Destailleur
b95fa8ad3e
Merge pull request #10038 from aspangaro/10.0_members
...
NEW Add gender in member card
2018-12-14 16:24:00 +01:00
Laurent Destailleur
2011afe6fb
Merge branch 'develop' into actionrefused
2018-12-14 15:48:24 +01:00
Laurent Destailleur
611ccc4a9a
Merge branch 'develop' into fieldlabel
2018-12-14 15:42:01 +01:00
Alexandre SPANGARO
60f56fcf8d
Merge branch 'develop' into 10.0_members
2018-12-14 11:39:02 +01:00
Laurent Destailleur
38cd324da7
FIX Look and feel v8
2018-12-09 23:58:27 +01:00
Laurent Destailleur
ac48996bd3
FIX Look and feel v8
2018-12-09 23:41:59 +01:00
Laurent Destailleur
31c0bf301b
FIX Look and feel v8
2018-12-09 23:41:36 +01:00
Regis Houssin
2d8494050f
FIX scrutinizer
2018-12-03 11:21:49 +01:00
Frédéric FRANCE
3b31354dc2
cats may be int or array
2018-12-02 10:33:23 +01:00
Frédéric FRANCE
ab02cb3cde
doc comment adherent class
2018-12-02 10:12:40 +01:00
Laurent Destailleur
8f15fe9c63
Empty lines
2018-11-26 12:41:10 +01:00
Alexandre SPANGARO
2d55666a0b
NEW Add gender in member card
2018-11-18 21:50:58 +01:00
Frédéric FRANCE
12dcda7e02
Merge remote-tracking branch 'upstream/develop' into fieldlabel
2018-11-15 22:01:36 +01:00
Frédéric FRANCE
731d19a29b
add tooltip to butActionRefused
2018-11-13 21:40:17 +01:00
Frédéric FRANCE
09efde4901
Merge remote-tracking branch 'upstream/develop' into fieldlabel
2018-11-09 18:13:59 +01:00
Regis Houssin
89389baeac
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email
2018-11-09 15:37:29 +01:00
Philippe GRAND
671b4dc227
fix : missing translation
2018-11-07 14:01:49 +01:00
Laurent Destailleur
46db246273
Look and feel v9: Autofocus on create forms
2018-11-07 13:04:43 +01:00
Laurent Destailleur
66ffcf287a
Fix filter on extrafields
2018-11-07 12:49:17 +01:00
Laurent Destailleur
4a25317f10
Fix security on GETPOST('action'). Param must be sanitized.
2018-11-05 20:29:07 +01:00
Laurent Destailleur
c0f4ec5a3e
FIX sanitize param $action
2018-11-05 17:53:31 +01:00
Laurent Destailleur
90d3b80efb
NEW Add email in event histor for reminder email of expired subsription
2018-11-03 22:53:55 +01:00
Laurent Destailleur
68ec172798
Fix setup to enable reminder b email
2018-11-03 12:37:52 +01:00
Frédéric FRANCE
da3ee9ad9a
Merge remote-tracking branch 'upstream/develop' into fieldlabel
2018-10-30 19:04:35 +01:00
Regis Houssin
9589f69574
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_email
Conflicts:
htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
2018-10-30 18:29:28 +01:00
Laurent Destailleur
f845a52b20
Fix phpcs
2018-10-30 16:37:50 +01:00
Laurent Destailleur
2c3cd7a668
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/modSyslog.class.php
2018-10-30 15:32:09 +01:00
Laurent Destailleur
2b526f7469
Fix phpcs
2018-10-30 15:28:11 +01:00
Laurent Destailleur
68f6ebd0ff
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/core/lib/security.lib.php
htdocs/modulebuilder/template/myobject_card.php
2018-10-30 14:47:39 +01:00
Laurent Destailleur
ca6d15a3eb
Merge pull request #9820 from laudeco/hotfix/9640_member_email
...
FIX the member e-mail on resign and validation.
2018-10-30 12:41:34 +01:00
Laurent Destailleur
a8e6c3832e
Update list.php
2018-10-30 12:30:56 +01:00
atm-ph
c83e67123d
Fix pgsql : operator does not exist: timestamp without time zone ~~ unknown
2018-10-29 11:04:16 +01:00
Regis Houssin
569d59d251
FIX change my deprecated email
2018-10-27 14:43:12 +02:00
Frédéric FRANCE
d67c40dffe
remove fieldlabel and add fieldeditkey
2018-10-27 13:01:01 +02:00
De Coninck Laurent
d347cf3a85
set a message
2018-10-26 16:18:27 +02:00
Laurent Destailleur
852b069785
Fix reponsive in stats pages
2018-10-26 15:46:17 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
2018-10-24 23:04:26 +02:00
De Coninck Laurent
402bbbe839
fix the member e-mail on resign and validation.
...
Since the member module is only using the new configuration and the name of the global variabels changed you have a blocking e-mail error when you try to resign or validate a member. In order to fix that I fallback on the previous variable like that it's still working.
[see: #9640 ]
2018-10-19 17:23:53 +02:00
Frédéric FRANCE
5e7a330f16
Update adherent.class.php
2018-10-15 08:53:47 +02:00
Laurent Destailleur
cb53e18aa4
Social network module
2018-10-12 11:19:18 +02:00
Laurent Destailleur
ded5c4c3dd
Social network module
2018-10-12 11:02:03 +02:00
Laurent Destailleur
8f4b74733c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/class/adherent.class.php
2018-10-10 01:51:54 +02:00
Laurent Destailleur
d75828567c
Fix amount last subscription
2018-10-10 01:44:56 +02:00
Laurent Destailleur
2539f0047f
FIX Sending of reminder for expired subscriptions
2018-10-09 23:10:39 +02:00
Philippe GRAND
af0bcb2631
Standardize code
2018-10-09 09:40:00 +02:00
Philippe GRAND
bba6669f03
Merge remote-tracking branch 'upstream/develop' into new_branch_05_10_2018
2018-10-09 08:47:26 +02:00
Laurent Destailleur
506ba30d5a
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-06 20:54:14 +02:00
Laurent Destailleur
a7d26409c7
FIX trackid into email sent from member module.
2018-10-06 20:51:35 +02:00
Philippe GRAND
dd9af92020
Standardize code
2018-10-06 12:07:24 +02:00
Philippe GRAND
b3925dd2bd
Standardize code
2018-10-05 16:04:10 +02:00
Philippe GRAND
e045d0e9ac
Translation
2018-10-04 09:55:05 +02:00
Laurent Destailleur
ae62204a79
Merge pull request #9628 from grandoc/new_branch_28_09_2018
...
Standardize and update code
2018-10-01 01:04:36 +02:00
Philippe GRAND
f630e2100a
Standardize and update code
2018-09-28 14:32:57 +02:00
Emma
0979633850
Fix state name for list field title in adherent
2018-09-27 14:22:33 +02:00
Philippe GRAND
c2e2395415
Comment and typo
2018-09-21 09:18:12 +02:00
Frédéric FRANCE
8f5e5be01c
reduce complexity libstatut adherent
2018-09-16 08:06:17 +02:00
Frédéric FRANCE
987fdbe73c
Merge remote-tracking branch 'upstream/develop' into patch-6
2018-09-12 21:29:41 +02:00
Frédéric FRANCE
3e71f4e6b0
Merge remote-tracking branch 'upstream/develop' into patch-6
2018-09-12 18:36:49 +02:00
Frédéric FRANCE
998b67fa98
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-12 18:32:15 +02:00
Laurent Destailleur
f5074f4962
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-12 18:12:17 +02:00
Laurent Destailleur
9cbba2dc7d
Add log
2018-09-12 15:28:59 +02:00
Frédéric FRANCE
f02b2f0239
Merge remote-tracking branch 'upstream/develop' into patch-6
2018-09-09 13:35:58 +02:00
Frédéric FRANCE
8249756726
replace select_date
2018-09-09 10:40:00 +02:00
Frédéric FRANCE
a3fa13994b
replace select_date
2018-09-09 09:36:12 +02:00
Frédéric FRANCE
4a7ea33008
replace select_date
2018-09-09 08:02:26 +02:00
Frédéric FRANCE
2b62c4ca8f
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-08 10:50:27 +02:00
Philippe GRAND
a6d13b06b0
Standardize and update call to
2018-09-07 10:40:36 +02:00
Frédéric FRANCE
65b74ad30f
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-04 20:48:35 +02:00
Frédéric FRANCE
bdcac95761
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-04 15:15:23 +02:00
Philippe GRAND
707f8b7312
fix merge
2018-09-04 14:49:56 +02:00
Philippe GRAND
47b6374abc
Standardize and update code
2018-09-04 13:45:20 +02:00
Philippe GRAND
0492492df1
fix merge
2018-09-04 12:30:06 +02:00
Laurent Destailleur
23f4e7cc36
FIX #9251
2018-09-04 11:49:11 +02:00
Laurent Destailleur
c7fdd8686b
NEW Add civility in list of members. Close #9251
2018-09-04 11:41:28 +02:00
Philippe GRAND
7a0c19485e
fix merge
2018-09-03 09:34:08 +02:00
Frédéric FRANCE
2a9ef8dc05
move phpcs:ignore
2018-09-02 22:05:19 +02:00
Frédéric FRANCE
e13a8ec572
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-02 18:19:45 +02:00
Laurent Destailleur
3d3edb19d8
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
htdocs/langs/en_US/commercial.lang
2018-09-02 15:48:26 +02:00
Frédéric FRANCE
2a5c994009
move phpcs:ignore
2018-09-02 14:01:37 +02:00
Philippe GRAND
5d273960dc
fix conflict
2018-09-01 22:40:38 +02:00
Laurent Destailleur
dfda029da4
FIX a removed option was still in setup
2018-09-01 17:44:07 +02:00
Laurent Destailleur
c17233a409
More logs
2018-09-01 16:51:40 +02:00
Laurent Destailleur
c8912d6a4f
Merge pull request #9242 from frederic34/camelCaps
...
mark non camelCaps function
2018-09-01 15:37:56 +02:00
Philippe GRAND
17e349eba2
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2018-09-01 14:27:53 +02:00
Laurent Destailleur
bcee0ef0ae
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/commande/dispatch.php
htdocs/societe/class/societe.class.php
htdocs/stripe/config.php
2018-09-01 14:16:57 +02:00
Laurent Destailleur
26cff9e11f
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/langs/en_US/blockedlog.lang
htdocs/stripe/config.php
2018-09-01 14:13:01 +02:00
Frédéric FRANCE
10200374ef
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-09-01 14:06:23 +02:00
Frédéric FRANCE
57fb3dc2f4
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-09-01 13:52:51 +02:00
Laurent Destailleur
bb444c80d0
Merge pull request #9360 from frederic34/patch-18
...
Update ldap.php
2018-09-01 13:28:16 +02:00
Philippe GRAND
d8e6492e93
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2018-09-01 13:07:30 +02:00
Laurent Destailleur
5604f3b0c3
Merge pull request #9376 from frederic34/functionCommentMissing
...
function Comment Missing
2018-09-01 12:59:32 +02:00
Philippe GRAND
1944ef0dc3
conflict resolution
2018-09-01 12:38:22 +02:00
Frédéric FRANCE
945eede4a5
doxygen fixs
2018-08-31 23:12:55 +02:00
Philippe GRAND
70ae8c6081
Standardize and update code
2018-08-31 18:27:16 +02:00
Frédéric FRANCE
f61450ffa8
Update ldap.php
2018-08-30 23:04:32 +02:00
Frédéric FRANCE
9c44f80746
Update card.php
2018-08-30 23:03:03 +02:00
Frédéric FRANCE
6aee680a4f
PSR2 ClassDeclaration
2018-08-29 22:06:05 +02:00
Frédéric FRANCE
b03f4004ea
PSR2 FunctionClosingBrace
2018-08-29 21:25:22 +02:00
Frédéric FRANCE
cbdc669ba9
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-29 18:45:36 +02:00
Laurent Destailleur
2daa5b3ae0
Fix phpcs
2018-08-29 17:09:58 +02:00
Laurent Destailleur
ee204e2e64
Fix regression in php style
2018-08-29 15:37:35 +02:00
Frédéric FRANCE
fe4260a014
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-28 09:34:53 +02:00
Laurent Destailleur
1842a4bb41
Merge pull request #9278 from grandoc/new_branch_21_08_2018
...
Update and standardize code
2018-08-28 02:13:28 +02:00
ptibogxiv
ca8a22a3ad
fix sync user/member
...
add more fields to sync
2018-08-28 01:35:01 +02:00
Philippe GRAND
2fa82edd39
Standardize and update code
2018-08-23 17:07:27 +02:00
ptibogxiv
b2a438b384
fix sync user/member
...
add more fields to sync
2018-08-23 10:06:32 +02:00
Philippe Grand
92cb9c4204
Update adherentstats.class.php
2018-08-22 22:35:04 +02:00
Philippe GRAND
449ef9c464
Update and standardize code
2018-08-22 18:12:44 +02:00
Philippe GRAND
29f15b4ae6
Update and standardize code
2018-08-22 10:51:55 +02:00
Frédéric FRANCE
6b6daf178f
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-21 20:57:58 +02:00
Laurent Destailleur
db3c17668e
Fix coding style
2018-08-21 19:08:11 +02:00
Laurent Destailleur
0799970804
Merge pull request #9248 from frederic34/FunctionDeclaration
...
function declaration
2018-08-21 13:41:56 +02:00
Philippe GRAND
da951e61f2
Update and standardize code
2018-08-17 22:29:21 +02:00
Philippe GRAND
c48211ad70
Update and standardize code
2018-08-17 19:31:22 +02:00
Frédéric FRANCE
39462742e2
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-16 08:17:55 +02:00
Laurent Destailleur
b515511ad6
Merge branch 'develop' into FunctionDeclaration
2018-08-16 00:52:55 +02:00
Frédéric FRANCE
69a7af88e7
function declaration
2018-08-15 18:14:02 +02:00
Frédéric FRANCE
54a078149a
function declaration
2018-08-15 17:34:35 +02:00
Frédéric FRANCE
a0a6afc224
return comment
2018-08-14 12:23:10 +02:00
Frédéric FRANCE
3210181a3d
rule for private function is different
2018-08-14 10:21:34 +02:00
Frédéric FRANCE
850ac34020
mark non camelCaps function
2018-08-13 17:26:32 +02:00
Laurent Destailleur
9fc5d39d07
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-12 20:09:36 +02:00
Laurent Destailleur
b11d5c2f71
Merge pull request #9228 from atm-florian/8.0
...
fix : remove comment on commit
2018-08-12 19:13:07 +02:00
Laurent Destailleur
12e21b4886
FIX update extrafields
2018-08-12 16:29:26 +02:00
florian HENRY
f0a32a2dea
fix : remove comment on commit
2018-08-09 20:41:15 +02:00
Philippe GRAND
948647f3f9
comment translation
2018-08-04 14:17:51 +02:00
Philippe GRAND
f17275845d
standardize
2018-07-28 14:29:28 +02:00
Laurent Destailleur
27a27e02a1
Fix css
2018-06-22 22:53:53 +02:00
Laurent Destailleur
ad2df304b4
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/customer/lines.php
htdocs/fourn/commande/card.php
htdocs/societe/class/societe.class.php
2018-06-18 13:31:29 +02:00
Inovea Conseil
d5a3e63e05
Fix missing paramater for generateDocument
2018-06-15 09:47:28 +02:00
Regis Houssin
f9a86ba43f
Fix: MEMBER_MODIFY trigger not called if i change only extrafields
2018-06-14 14:01:05 +02:00
Laurent Destailleur
4a5fd35e11
Look and feel v8
2018-06-13 22:57:41 +02:00
Laurent Destailleur
f9a24c53c0
Fix bug reported by scrutinizer
2018-06-06 18:20:31 +02:00
Laurent Destailleur
6e62727c37
Fix scrutinizer bug
2018-06-06 18:18:50 +02:00
Frédéric FRANCE
812b182680
loadlangs
2018-05-26 17:04:23 +02:00
Laurent Destailleur
94ccb44673
Fix bad url wor external subscription page
2018-05-12 11:02:44 +02:00
Laurent Destailleur
3374c50e2d
CSS
2018-05-01 10:42:09 +02:00
Philippe GRAND
bf1e5bc618
Merge remote-tracking branch 'upstream/develop' into new_branch_23_04_2018
2018-04-24 17:31:10 +02:00
Laurent Destailleur
461ae46cc4
FIX When on a high page and searching for a small result, list was not
...
visible.
2018-04-24 11:37:57 +02:00
Philippe GRAND
bcf5c5d78a
clean code
2018-04-23 16:04:52 +02:00
Philippe GRAND
a8c7be3fb5
Typo
2018-04-21 12:14:51 +02:00
Philippe GRAND
3856d64b63
update code
2018-04-21 12:07:19 +02:00
Laurent Destailleur
8aab183567
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-19 14:00:18 +02:00
Laurent Destailleur
1dc466e1fb
FIX CVE-2018-10095
2018-04-18 12:32:19 +02:00
Laurent Destailleur
7ade4e37f2
FIX CVE-2018-10094
2018-04-18 12:23:49 +02:00
Laurent Destailleur
bbfc4a3e17
NEW Look and feel v8 - Show Picto "+" on all links "Add record"
2018-04-18 03:26:15 +02:00
Laurent Destailleur
8fbde88872
Look and feel v8
2018-04-15 17:37:49 +02:00
Laurent Destailleur
9e50bbb9b1
standardize code
2018-04-15 16:35:18 +02:00
Laurent Destailleur
be965bdbab
Clean code
2018-04-13 13:28:48 +02:00
Laurent Destailleur
1521b0595b
Clean code
2018-04-13 11:03:03 +02:00
All-3kcis
880fa55dd5
display user-friendly filesize
2018-04-12 15:29:22 +02:00
Laurent Destailleur
0bf4381226
NEW The field "visible" on extrafield can accept expression as condition
2018-04-10 15:39:11 +02:00
Laurent Destailleur
7108f68db9
Remove old deprecated hook insertExtraFields. Triggers must be used for
...
action on CRUD events.
2018-04-10 12:03:01 +02:00
Laurent Destailleur
956fc2376d
FIX #8483
2018-04-06 12:27:55 +02:00
Regis Houssin
b43aca0f8d
Fix: use dol_string_nohtmltag instead (with strip_tags)
2018-04-06 08:52:02 +02:00
Regis Houssin
c5cf2e4d50
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap
2018-04-06 08:13:37 +02:00
Laurent Destailleur
9d9f3ddf85
Merge pull request #8502 from ATM-Marc/NEW_create_from_list
...
NEW: generalize use of button to create new element from list
2018-04-05 16:40:15 +02:00
Laurent Destailleur
28b00fc021
Merge pull request #8486 from hregis/develop_email
...
Fix: avoid space in email address
2018-04-05 13:12:03 +02:00
Laurent Destailleur
af6ab27b23
Merge pull request #8481 from grandoc/develop
...
cleaning code
2018-04-05 12:45:10 +02:00
Marc de Lima Lucio
c2d3e2a701
NEW: generalize button to create object from list, for the remaining lists
2018-04-03 15:28:12 +02:00
Regis Houssin
edaa558ef7
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap
2018-04-01 11:50:16 +02:00
Laurent Destailleur
43f8834b28
Uniformize code with the new module builder framework
2018-03-31 18:48:27 +02:00
Regis Houssin
8c610904ac
Fix: remove multi spaces
2018-03-30 07:36:23 +02:00
Regis Houssin
546f3f8b96
Fix: avoid space in email address
2018-03-30 07:19:42 +02:00
Regis Houssin
34c484dea7
Fix: missing adherent type
2018-03-29 19:16:39 +02:00
Regis Houssin
0e4d796f88
Fix: more complete
2018-03-29 18:47:53 +02:00
Philippe GRAND
bad970ff05
cleaning code
2018-03-29 15:04:48 +02:00
Regis Houssin
6e616e1198
Fix: better performance for openldap
2018-03-28 10:06:00 +02:00
Laurent Destailleur
53dde8dc0c
Fix confirmation email for membership payment
2018-03-25 15:00:43 +02:00
Laurent Destailleur
6ef1dbbe0f
FIX auto open contract if one result found
2018-03-24 18:28:06 +01:00
Laurent Destailleur
c864dbd515
Save Stripe customer id when using online member subscription
2018-03-23 23:59:35 +01:00
Laurent Destailleur
c7e93a5a3b
Serious enhancement in auto subscription for member module
2018-03-23 22:49:08 +01:00
Laurent Destailleur
53edb86ffb
Make sending of email for member module ok with new email template archi
2018-03-23 19:35:25 +01:00
Laurent Destailleur
7363ae17ee
Move setup of email for module module into email templates
2018-03-23 16:09:46 +01:00
Laurent Destailleur
5556986001
Trad
2018-03-21 20:15:21 +01:00
Laurent Destailleur
517301f014
Work on subscription reminder
2018-03-21 16:40:09 +01:00
Laurent Destailleur
928d428956
Merge pull request #8412 from atm-florian/dev_scrunit
...
fix scrutinizer
2018-03-19 12:08:14 +01:00
Laurent Destailleur
5a98958280
Update adherent.class.php
2018-03-19 12:07:08 +01:00
Laurent Destailleur
d4ae0395ed
NEW Look and feel v8: Use a different picto for delete and unlink
2018-03-18 19:13:42 +01:00
florian HENRY
9cd5fabba8
fix scrutinizer
2018-03-16 16:51:24 +01:00
Laurent Destailleur
a642ac60f6
Removed deprecated property $cotisation on membe types
2018-03-16 10:38:09 +01:00
Laurent Destailleur
e2cbf903ba
Remove deprecated code
2018-03-16 10:33:23 +01:00
Laurent Destailleur
eb5d5d07ec
Remove the old deprecated code of doActions in canvas. The doActions of
...
hooks are already available and are better.
2018-03-16 09:58:46 +01:00
Laurent Destailleur
852bf8dab7
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
htdocs/societe/class/societe.class.php
2018-03-15 01:57:35 +01:00
Laurent Destailleur
4957ea9178
Fix SQLi reported by op7ica
2018-03-15 01:55:16 +01:00
Laurent Destailleur
c3b9c91200
Fix SQLi reported by op7ica
2018-03-15 01:33:46 +01:00
Laurent Destailleur
93f4d6fdcd
Translation
2018-03-11 21:34:38 +01:00
florian HENRY
8e84b733dc
fix scrutinizer
2018-03-10 00:13:41 +01:00
Laurent Destailleur
9efea6e30e
Fix var not defined
2018-03-09 22:59:44 +01:00
Laurent Destailleur
0b316c3980
Attach invoice on email subscription confirmation
2018-03-08 15:01:34 +01:00
Laurent Destailleur
1ca5c7083a
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formother.class.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
2018-03-07 11:54:48 +01:00
Laurent Destailleur
592a97f9a5
Fix default topic
2018-03-06 12:45:48 +01:00
Laurent Destailleur
a086bd0137
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_linkedfiles.inc.php
htdocs/core/class/utils.class.php
2018-03-06 09:20:45 +01:00
Laurent Destailleur
7c95233e3c
FIX Trad and creation date in subscription create
2018-03-06 09:08:28 +01:00
Laurent Destailleur
0cfa19ee09
NEW Online payment of invoice and subscription record the payment
...
automatically.
2018-03-06 00:12:23 +01:00
Laurent Destailleur
2f9f4d0675
WIP Create payment of member subscription with paypal
2018-03-05 21:46:24 +01:00
Laurent Destailleur
628a14db0c
FIX Trad and creation date in subscription create
2018-03-05 17:06:14 +01:00
Laurent Destailleur
0b3e2e92e2
Revert "Fix SQL error when creating subscription"
...
This reverts commit d422fc8a11
2018-03-05 16:13:32 +01:00
Laurent Destailleur
d422fc8a11
Fix SQL error when creating subscription
2018-03-05 16:09:26 +01:00
Laurent Destailleur
184c773301
Fix error management
2018-03-05 15:43:48 +01:00
Laurent Destailleur
04934cc4aa
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/class/contrat.class.php
htdocs/core/lib/functions.lib.php
htdocs/projet/tasks/time.php
2018-02-27 19:18:43 +01:00
Laurent Destailleur
41638e6dff
Fix back link of look and feel v7
2018-02-26 09:20:05 +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
0262b64eb1
Merge pull request #8230 from hregis/7.0_bug4
...
Fix: missing hook parameters
2018-02-25 12:56:43 +01:00
Regis Houssin
b216249214
Fix: missing hook parameters
2018-02-24 15:01:29 +01:00
Regis Houssin
4c06384197
Fix: differentiate sharing of "member" and "member_type"
2018-02-24 11:13:14 +01:00
Laurent Destailleur
b4446764f8
Clean code of deprecated usage
2018-02-21 14:48:25 +01:00
Laurent Destailleur
c4130730cb
Clean code around fetch_optionals()
2018-02-20 19:38:18 +01:00
Laurent Destailleur
7f8cbc0f62
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/adherents/type.php
htdocs/contrat/services.php
htdocs/contrat/tpl/linkedobjectblock.tpl.php
htdocs/install/upgrade2.php
2018-02-14 22:08:18 +01:00
Laurent Destailleur
d0fdf700d7
Update type.php
2018-02-14 20:51:33 +01:00
Laurent Destailleur
0d00c51c2a
Update type.php
2018-02-14 20:51:05 +01:00
De Coninck Laurent
1052213c97
Fix 8183 - adherent welcome e-mail
...
Fix the adherent welcome e-mail.
[see: #8183 ]
2018-02-12 18:12:43 +01:00
Laurent Destailleur
d744a1af0d
Fix look and feel v7
2018-01-30 11:30:03 +01:00
Laurent Destailleur
e6bfc3354a
FIX #8071
2018-01-20 18:42:12 +01:00
Laurent Destailleur
0fb3669529
Fix for #8071
2018-01-20 18:33:25 +01:00
Laurent Destailleur
64ae70d106
Fix scrutinizer bug
2018-01-12 15:20:17 +01:00
Laurent Destailleur
ae59ca43cc
Fix sort of subscriptions
2018-01-10 13:02:05 +01:00
Laurent Destailleur
e6ffaa0f8b
Fix option MAIN_SHOW_TECHNICAL_ID
2018-01-07 16:41:45 +01:00
Laurent Destailleur
dbf7603118
Debug blockedlog for loi finance 2016
2018-01-05 04:31:48 +01:00
Laurent Destailleur
aad0da2513
Fix maxi debug of APIs (clean output fields)
2017-12-21 16:50:18 +01:00
Laurent Destailleur
eab44f62b1
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_builddoc.inc.php
htdocs/core/class/html.form.class.php
htdocs/core/tpl/admin_extrafields_add.tpl.php
htdocs/core/tpl/admin_extrafields_edit.tpl.php
htdocs/core/tpl/admin_extrafields_view.tpl.php
htdocs/core/tpl/notes.tpl.php
htdocs/main.inc.php
htdocs/product/inventory/tpl/inventory.tpl.php
htdocs/societe/tpl/linesalesrepresentative.tpl.php
2017-12-21 14:35:33 +01:00
Laurent Destailleur
6a62e13960
FIX security vulnerability reported by ADLab of Venustech
2017-12-21 13:32:16 +01:00
