stickler-ci
b7045ef3a0
Fixing style errors.
2021-03-28 17:42:18 +00:00
daraelmin
1ae0e2a920
fix stafix style errorsle fix stale errorfix style errors
2021-03-28 19:38:20 +02:00
daraelmin
6fdff2c3ab
autoaffect individual status for thirdparty
2021-03-28 19:19:40 +02:00
daraelmin
e0551f1e32
Add ADHERENT_DEFAULT_CREATE_THIRDPARTY
2021-03-27 17:29:06 +01:00
daraelmin
bad5aa6468
fix excluded member color in graph
2021-03-27 13:39:15 +01:00
Laurent Destailleur
01c1101b29
Look and feel v14
2021-03-26 18:16:12 +01:00
Laurent Destailleur
8b4870b8b2
Fix look and feel v14
2021-03-24 23:44:50 +01:00
Laurent Destailleur
a5034d44f7
$_POST war
2021-03-24 19:53:31 +01:00
Laurent Destailleur
86c7ab922a
Fix #yogosha5728
2021-03-24 18:57:23 +01:00
Regis Houssin
05419441aa
FIX missing return edit if update error
2021-03-23 19:58:15 +01:00
Laurent Destailleur
e3b019f923
Clean code
2021-03-23 01:32:17 +01:00
Laurent Destailleur
ca1715df96
Add some protection for SQL injection
2021-03-22 13:31:06 +01:00
Laurent Destailleur
15440917b1
Fix #ygosha5698
2021-03-22 11:30:18 +01:00
Laurent Destailleur
17e5605430
Merge branch 'develop' into patch-3
2021-03-21 21:02:53 +01:00
Laurent Destailleur
0f9b88d828
Merge pull request #16899 from daraelmin/daraelmin-status-exclu
...
Close #16255 Add new status "excluded" in membership management module
2021-03-21 20:56:07 +01:00
Laurent Destailleur
6cdfbc2e8c
Update website.php
2021-03-21 20:50:00 +01:00
stickler-ci
e779723ae3
Fixing style errors.
2021-03-21 13:50:35 +00:00
daraelmin
054864eccc
Merge branch 'develop' into daraelmin-status-exclu
2021-03-21 14:42:01 +01:00
daraelmin
e910810037
activate exlcude button
2021-03-21 14:38:15 +01:00
daraelmin
99d4618ab5
Fix 16897 V13 Wrong picto for Expired membership
...
Force picto for Expired membership when no subscription is needed to Waiting (as other)
2021-03-21 13:49:17 +01:00
daraelmin
860a2f2ffa
Fix #16893 picto UpToDate change to Unpaid sometimes
...
#Fix #16893 picto UpToDate change to Unpaid sometimes
As $now is set on the start of the script.
But, the timestamp may change before LibStatut is called at the end.
To avoid this we add 10 second to $now before comparing to dol_now() in LibStatut
2021-03-21 11:36:23 +01:00
Frédéric FRANCE
b7a46ae838
fix php8 warnings
2021-03-20 21:50:47 +01:00
Laurent Destailleur
2b3599dba5
Clean code
2021-03-20 21:29:36 +01:00
Frédéric FRANCE
f6e7285949
rename files from adherent to member
2021-03-20 19:06:15 +01:00
Frédéric FRANCE
fdcd7cc316
remove old fixed boxes in member area
2021-03-20 18:49:56 +01:00
daraelmin
4d8ed4bd40
merge develop
2021-03-20 15:34:30 +01:00
Laurent Destailleur
ae2d7b5096
Merge pull request #16826 from dolibit-ut/patch-119
...
Update document.php
2021-03-20 12:50:03 +01:00
Laurent Destailleur
0e2234db8b
Merge pull request #16818 from daraelmin/daraelmin-patch-2
...
Code translation
2021-03-20 11:59:29 +01:00
Laurent Destailleur
9774d5ea4f
Merge pull request #16825 from dolibit-ut/patch-118
...
Update agenda.php
2021-03-20 11:52:51 +01:00
Laurent Destailleur
86094525b1
Merge pull request #16829 from dolibit-ut/patch-121
...
Update subscription.php
2021-03-20 11:52:42 +01:00
Laurent Destailleur
655dc68087
Merge pull request #16827 from dolibit-ut/patch-120
...
Update note.php
2021-03-20 11:52:32 +01:00
Laurent Destailleur
db71b3cbf8
Merge pull request #16830 from dolibit-ut/patch-122
...
Update type_translation.php
2021-03-20 11:51:05 +01:00
Laurent Destailleur
0e4d977549
Merge pull request #16847 from ptibogxiv/patch-419
...
FIx get optionnal in membertype with API
2021-03-20 11:38:00 +01:00
Laurent Destailleur
30d25f6a82
Merge pull request #16848 from frederic34/patch-3
...
fix php8 warning
2021-03-20 11:37:12 +01:00
Laurent Destailleur
acbce4b380
Merge pull request #16852 from frederic34/patch-7
...
fix php8 warning
2021-03-20 11:28:18 +01:00
Laurent Destailleur
f26abf73ce
Merge pull request #16853 from frederic34/patch-8
...
fix php8 warnings
2021-03-20 11:27:50 +01:00
Laurent Destailleur
ba6f97acbc
Merge pull request #16865 from frederic34/uniformisecomment
...
uniformise comments to remove nested comments
2021-03-20 11:24:39 +01:00
Frédéric FRANCE
bae1770176
uniformise comments to remove nested comments
2021-03-20 10:00:24 +01:00
Frédéric FRANCE
53ff22d625
fix doxygen
2021-03-20 09:18:40 +01:00
Frédéric FRANCE
65e4acdb82
fix php8 warnings
2021-03-19 17:23:28 +01:00
Frédéric FRANCE
19079dcae6
fix php8 warning
2021-03-19 17:17:08 +01:00
Frédéric FRANCE
84b71dbcc8
fix php8 warning
2021-03-19 16:34:17 +01:00
Laurent Destailleur
5a4ffc18b9
FIx #yogosha5667
2021-03-19 13:02:55 +01:00
stickler-ci
ba29f327a9
Fixing style errors.
2021-03-19 11:41:27 +00:00
ptibogxiv
a9398e5630
FIx get optionnal in membertype with API
2021-03-19 12:39:38 +01:00
UT from dolibit
74de272236
Update type_translation.php
...
$help_url = '';
....
$help_url = 'EN:Module_Services_En|FR:Module_Services|ES:Módulo_Servicios|DE:Modul_Mitglieder';
llxHeader('', $title, $help_url);
2021-03-19 09:19:28 +01:00
UT from dolibit
c0a420bcb7
Update subscription.php
...
$help_url = "EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros|DE:Modul_Mitglieder";
llxHeader("", $title, $help_url);
2021-03-19 09:17:24 +01:00
stickler-ci
668deefc9e
Fixing style errors.
2021-03-19 08:16:44 +00:00
UT from dolibit
b17c5b50cd
Update note.php
...
$help_url = "EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros|DE:Modul_Mitglieder";
llxHeader("", $title, $help_url);
2021-03-19 09:15:48 +01:00
stickler-ci
e5eddff0a5
Fixing style errors.
2021-03-19 08:15:14 +00:00
UT from dolibit
b0f26ca2ee
Update document.php
...
$help_url = "EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros|DE:Modul_Mitglieder";
llxHeader("", $title, $help_url);
2021-03-19 09:14:47 +01:00
UT from dolibit
d76bd583f5
Update agenda.php
...
$help_url = "EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros|DE:Modul_Mitglieder";
llxHeader("", $title, $help_url);
2021-03-19 09:13:06 +01:00
daraelmin
e290884552
update subscription and type
2021-03-18 23:23:57 +01:00
daraelmin
071b6a1bdc
Code translation
2021-03-18 23:11:19 +01:00
Laurent Destailleur
2fa1790fe9
Merge pull request #16784 from frederic34/patch-15
...
fix php8 warning
2021-03-18 23:08:31 +01:00
Laurent Destailleur
a200f6f6ea
Merge pull request #16785 from frederic34/fixextrafieldsadmin
...
fix php8 warning
2021-03-18 23:08:15 +01:00
Laurent Destailleur
ebd79afa6f
Merge pull request #16788 from frederic34/patch-17
...
fix php8 warning
2021-03-18 22:57:57 +01:00
UT from dolibit
972d162c5e
Update type.php
...
$help_url = 'EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros|DE:Modul_Mitglieder';
2021-03-18 21:16:44 +01:00
Frédéric FRANCE
39acef8df7
Update card.php
2021-03-18 08:26:47 +01:00
Frédéric FRANCE
c147d47ad9
fix php8 warning
2021-03-18 08:23:06 +01:00
Frédéric FRANCE
75cf5e3599
fix php8 warning
2021-03-17 23:55:46 +01:00
Frédéric FRANCE
efe75b5d0d
fix php8 warning
2021-03-17 23:45:48 +01:00
Frédéric FRANCE
bdae679463
fix php8 warnings
2021-03-16 18:42:35 +01:00
Laurent Destailleur
e00e6cfd9a
Merge pull request #16721 from aspangaro/14a25
...
Translation "Generated documents"
2021-03-16 10:25:31 +01:00
Alexandre SPANGARO
6960f0dc25
Uniformize translation
2021-03-16 04:22:55 +01:00
Alexandre SPANGARO
03481a0197
Uniformize translation
2021-03-16 04:22:43 +01:00
Alexandre SPANGARO
4fd24c6855
Translation "Generated documents"
2021-03-16 04:04:18 +01:00
Laurent Destailleur
f0d3c19d51
Merge pull request #16690 from dolibit-ut/patch-75
...
Update card.php
2021-03-15 17:17:35 +01:00
UT from dolibit
2040596b8c
Update adherent.php
...
-> $help_url add 'DE:Modul_Mitglieder'
2021-03-15 15:46:43 +01:00
UT from dolibit
d7e930fe63
Update card.php
...
-> $help_url add 'DE:Modul_Mitglieder'
2021-03-15 15:44:29 +01:00
daraelmin
82509e2102
merged conflict with develop
2021-03-15 13:12:13 +01:00
Laurent Destailleur
0dd33fed4f
Merge pull request #16654 from daraelmin/daraelmin-patch-1
...
Standardize var $AdherentsXXX in $MembersXXX
2021-03-15 11:10:52 +01:00
daraelmin
0127a3bedb
Update index.php
2021-03-14 17:34:38 +01:00
daraelmin
639e234d4b
Use dol_now instead of time()
2021-03-14 16:44:34 +01:00
daraelmin
32a79cfd8d
Standardize var $AdherentsXXX in $MembersXXX
2021-03-14 15:51:00 +01:00
daraelmin
30dc375ecc
Graphcolor
2021-03-14 14:42:55 +01:00
daraelmin
749e33d518
Add SommeE
2021-03-14 14:37:20 +01:00
daraelmin
ed7dc56c82
Update index.php
2021-03-14 14:31:27 +01:00
daraelmin
193082b195
Update index.php
2021-03-14 13:59:50 +01:00
Laurent Destailleur
cc10106a21
Fix protection on int
2021-03-14 12:20:23 +01:00
Laurent Destailleur
12f50a76d7
Fix yogosha #5627
2021-03-14 11:48:39 +01:00
daraelmin
ed3b0032bb
Syntax error
2021-03-13 22:46:51 +01:00
daraelmin
e2ba3b599d
Update index.php
2021-03-13 22:42:49 +01:00
daraelmin
47f7ee09cf
img_picto for excluded should be status8
2021-03-13 21:10:47 +01:00
daraelmin
64c347edfa
Add exclusion email template global variable
2021-03-13 20:25:29 +01:00
daraelmin
d979440ca6
Call exclude() when updating status to -2
2021-03-13 19:21:44 +01:00
daraelmin
39fba3c4a9
Update comment to mention exclude() fonction
2021-03-13 19:17:28 +01:00
daraelmin
5f0249894d
Add property mail_exclusion
...
Unused for the moment
2021-03-13 19:11:21 +01:00
daraelmin
8f73334a79
Add excluded status in adherent class
2021-03-13 18:24:17 +01:00
daraelmin
6f7f5a57e1
Search on excluded member
2021-03-13 16:11:48 +01:00
daraelmin
e038408195
Update comment on subscription creation
...
subscription is not allowed if the membre status is "excluded"
2021-03-13 15:34:29 +01:00
daraelmin
fa25ba797f
Add excluded status in adherent type stats
2021-03-13 15:28:31 +01:00
daraelmin
d138430684
Adding Excluded status in adherent as -2
2021-03-13 15:18:44 +01:00
Laurent Destailleur
fc08c48bf3
Merge pull request #16591 from Givriz/dev
...
Replace gender and civility by a picto
2021-03-11 21:36:16 +01:00
lmarcouiller
1b242a8a19
Fix #16615 : Adherent statistics color
2021-03-11 09:43:56 +01:00
Laurent Destailleur
82d5c7289d
Add property widgettype
2021-03-10 17:02:39 +01:00
Damien BENOIT
2b33bb2d04
Merge pull request #11 from Dolibarr/develop
...
Update fork
2021-03-10 16:53:35 +01:00
Laurent Destailleur
c2200e6ffd
Clean code
2021-03-10 16:41:48 +01:00
stickler-ci
d5e6f54b5c
Fixing style errors.
2021-03-10 15:33:53 +00:00
Givriz
6e46396b17
Ajout de picto pour le genre et la civilité
2021-03-10 16:31:50 +01:00
Laurent Destailleur
a3896bd237
Restore default tabs
2021-03-08 16:47:49 +01:00
Frédéric FRANCE
b0f735350f
new box replace
2021-03-02 22:31:55 +01:00
Frédéric FRANCE
da038cf590
new box replace
2021-03-02 22:29:02 +01:00
Frédéric FRANCE
22bc3b879b
new box replace
2021-03-02 22:21:34 +01:00
Frédéric FRANCE
d68de8617b
new box replace
2021-03-02 22:00:09 +01:00
Frédéric FRANCE
6cf8a46095
Merge remote-tracking branch 'upstream/develop' into boxindex
2021-03-02 20:41:01 +01:00
Laurent Destailleur
a161edefb1
Look and feel v14
2021-03-02 12:33:55 +01:00
Frédéric FRANCE
3b428004d8
Merge remote-tracking branch 'upstream/develop' into boxindex
2021-03-02 00:09:44 +01:00
Laurent Destailleur
1cdea45707
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/adherents/subscription/list.php
htdocs/societe/canvas/company/tpl/card_create.tpl.php
htdocs/societe/canvas/individual/tpl/card_create.tpl.php
htdocs/societe/card.php
2021-03-01 17:46:36 +01:00
Laurent Destailleur
222012da37
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/class/paymentvarious.class.php
htdocs/compta/bank/various_payment/card.php
htdocs/don/card.php
htdocs/langs/en_US/main.lang
htdocs/public/payment/newpayment.php
test/phpunit/DateLibTzFranceTest.php
2021-03-01 15:48:30 +01:00
Frédéric FRANCE
8c45137b37
Merge remote-tracking branch 'upstream/develop' into boxindex
2021-03-01 12:55:45 +01:00
Frédéric FRANCE
1b046f25cf
add new rule
2021-03-01 00:19:52 +01:00
Laurent Destailleur
77151bd560
Standardize tabs
2021-02-28 23:53:20 +01:00
Laurent Destailleur
5406de13ee
css
2021-02-28 21:33:13 +01:00
Laurent Destailleur
3a0b762a6e
Var not defined
2021-02-24 12:01:58 +01:00
Frédéric FRANCE
a0031901e4
complete doaction hook
2021-02-22 11:36:03 +01:00
Laurent Destailleur
b4e301893c
Update subscription.php
2021-02-22 11:22:48 +01:00
abb
765893f9e6
new:hook doActions for subscriptions with possibility to modify values of variables $datefrom,$dateto,$paymentdate inside hook
2021-02-21 19:44:27 +01:00
Laurent Destailleur
2be6992916
Fix include_once into include for inc.php file. See comment in #16338
2021-02-19 16:10:19 +01:00
Laurent Destailleur
d16276ea2c
Clean code
2021-02-16 11:15:42 +01:00
Laurent Destailleur
32370bf63d
Look and feel v14
2021-02-15 20:13:38 +01:00
Laurent Destailleur
3e41f69d3d
Fix bad permission check
2021-02-14 21:56:15 +01:00
Laurent Destailleur
4a35600e62
Merge pull request #16278 from bafbes/abb120357
...
new : hook context subscriptioncard and restrictedArea block for subscriptions
2021-02-14 21:53:25 +01:00
abb
d92e17aabd
new : hook context subscriptioncard and restrictedArea block for subscriptions
2021-02-12 19:21:31 +01:00
abb
b8fde12def
Fix : To use restrictedArea Hook, we need to call initHooks before restrictedArea
2021-02-12 17:19:45 +01:00
Frédéric FRANCE
f394e55ade
deprecate non camelCaps functions
2021-02-09 10:26:17 +01:00
Frédéric FRANCE
7cd698aff9
Merge remote-tracking branch 'upstream/develop' into boxindex
2021-01-26 20:19:49 +01:00
Laurent Destailleur
452aea1d8b
Fix bad test
2021-01-23 17:59:56 +01:00
Laurent Destailleur
dd69aed27b
Fix error test
2021-01-23 17:49:08 +01:00
Frédéric FRANCE
ceff964ad5
member has ref now
2021-01-13 21:56:51 +01:00
Frédéric FRANCE
7291bf34f0
boxes
2021-01-02 22:29:23 +01:00
Frédéric FRANCE
bd762bc58f
boxes
2021-01-02 21:50:58 +01:00
Frédéric FRANCE
bd874a136e
can add box on member index page
2021-01-02 20:10:29 +01:00
Frédéric FRANCE
6fad38db57
can add box on member index page
2021-01-02 20:04:40 +01:00
Laurent Destailleur
1ab459e854
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-02 16:19:08 +01:00
Laurent Destailleur
b88ee6eff4
Merge pull request #15815 from FHenry/dev_add_tag_on_massaction
...
NEW: Add mass action add tag for product/service, user, thirdparty, warehouse, project, bank account, members
2021-01-01 21:36:15 +01:00
Alexandre SPANGARO
46160614b8
Typo
2020-12-31 03:30:18 +01:00
Frédéric FRANCE
94e859bf6a
doxygen
2020-12-30 21:41:44 +01:00
Florian HENRY
806b40662f
merge develop
2020-12-28 21:15:25 +01:00
Laurent Destailleur
f8b179a1be
Merge pull request #15351 from frederic34/patch-13
...
separate ref and rowid in members
2020-12-27 15:18:55 +01:00
Florian HENRY
f03574d061
bank ok
2020-12-24 14:56:26 +01:00
Florian HENRY
5ae5f3e7ac
let societe project acctioncomme website accounr
2020-12-24 00:32:54 +01:00
Florian HENRY
720539ff46
on goung
2020-12-23 23:52:43 +01:00
Florian HENRY
26d3ea2227
on going
2020-12-23 23:32:50 +01:00
Laurent Destailleur
d65dc85a10
FIX for php 8
2020-12-23 19:16:25 +01:00
Laurent Destailleur
8e839a34e2
FIX for php 8
2020-12-23 19:14:47 +01:00
Corentin Giroud-Argoud
4df0efa43d
[New] Add sendMail hook in subscription
...
Added sendMail hook in subscription, before a mail is sent to confirm a
subscription. It makes it more flexible for modules to interact with it.
2020-12-16 13:00:34 +01:00
Laurent Destailleur
cfa194436f
Debug v13
2020-12-11 00:55:21 +01:00
Frédéric FRANCE
914d2ae7f7
Merge remote-tracking branch 'upstream/develop' into patch-13
2020-12-04 20:40:35 +01:00
Laurent Destailleur
6d4a90b543
Clean code
2020-12-04 14:53:52 +01:00
Scrutinizer Auto-Fixer
6df4954b20
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-12-01 01:41:19 +00:00
Laurent Destailleur
00ad6df395
Fight against $_POST
2020-11-30 14:47:07 +01:00
Laurent Destailleur
e7775d2f79
Fix scrutinizer errors
2020-11-30 12:54:47 +01:00
Laurent Destailleur
fcf59180eb
Merge pull request #15541 from b92/patch-2
...
Use email model option to joint file for subscription
2020-11-28 02:27:07 +01:00
Laurent Destailleur
aa21af27db
Update subscription.php
2020-11-28 02:24:25 +01:00
Laurent Destailleur
574919de52
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
htdocs/accountancy/bookkeeping/balance.php
htdocs/adherents/class/subscription.class.php
htdocs/compta/bank/categ.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/boxes/box_task.php
htdocs/core/class/commondocgenerator.class.php
htdocs/core/class/interfaces.class.php
htdocs/core/lib/project.lib.php
htdocs/core/modules/modCategorie.class.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fichinter/class/fichinterrec.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/install/repair.php
htdocs/main.inc.php
htdocs/product/price.php
htdocs/projet/tasks/time.php
htdocs/reception/card.php
2020-11-27 15:45:12 +01:00
Laurent Destailleur
ac3c129735
Clean code
2020-11-27 14:24:15 +01:00
Frédéric FRANCE
9a2f945807
Merge remote-tracking branch 'upstream/develop' into patch-13
2020-11-27 11:15:10 +01:00
Laurent Destailleur
7bf12c8720
Fix name into popup of member in list of subscriptions
2020-11-27 01:22:13 +01:00
Laurent Destailleur
47a5037155
Fix dolGetFirstLastname() for 4 and 5
2020-11-27 01:18:01 +01:00
Bernard Saulme
be7714be1c
Use email model option to joint file for subscription
...
Allow the adherent subscription to use the email model option to join or no joint file.
2020-11-25 18:11:36 +01:00
Givriz
dca4cf5987
Feature : ajout de la class "button-cancel"
...
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
2020-11-23 15:12:52 +01:00
Laurent Destailleur
2f6f242d99
CSS
2020-11-23 12:29:38 +01:00
Givriz
c48129e279
Ajout de la class "button-save"
...
Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature)
2020-11-19 20:23:38 +01:00
Laurent Destailleur
780b8a6fb2
Fix navigation between members
2020-11-18 12:40:21 +01:00
Frédéric FRANCE
0a5e041775
Merge remote-tracking branch 'upstream/develop' into odtformembers
2020-11-14 00:56:21 +01:00
Frédéric FRANCE
4ca3c0aa95
Add odt for members
2020-11-14 00:48:13 +01:00
Frédéric FRANCE
dd2ab6f360
Update card.php
2020-11-13 21:56:17 +01:00
Frédéric FRANCE
0735993839
set ref at create
2020-11-11 12:17:23 +01:00
Frédéric FRANCE
c7557fdb8a
specimen
2020-11-11 11:12:19 +01:00
Frédéric FRANCE
4d48eb96ed
Update adherent.class.php
2020-11-11 07:16:07 +01:00
Frédéric FRANCE
d4f633ee74
check in card pdf
2020-11-10 23:41:15 +01:00
Frédéric FRANCE
016c9915ef
Update 12.0.0-13.0.0.sql
...
add ref in class
add ref in getNomUrl
add ref on card
2020-11-10 23:03:03 +01:00
Frédéric FRANCE
2f7b445c9e
doxygen
2020-11-10 21:57:49 +01:00
Laurent Destailleur
26b8e8d2bf
More logs
2020-11-08 18:52:26 +01:00
Frédéric FRANCE
5d90611795
Merge remote-tracking branch 'upstream/develop' into zapieruser
2020-11-05 14:42:37 +01:00
Frédéric FRANCE
2dfdd98b5a
Update vcard.php
2020-11-04 20:42:16 +01:00
Frédéric FRANCE
6e7448a1d0
Merge remote-tracking branch 'upstream/develop' into zapieruser
2020-11-04 19:00:10 +01:00
Laurent Destailleur
7294a47ef5
Fix generation of user from member, contact, applications for job
2020-11-04 13:33:52 +01:00
Laurent Destailleur
f5bdc1db6d
Update card.php
2020-11-02 20:15:03 +01:00
Frédéric FRANCE
3afb577888
Update card.php
2020-11-02 18:35:39 +01:00
Laurent Destailleur
ed6925d87d
Fix label
2020-11-02 16:46:28 +01:00
Laurent Destailleur
42a3a20dfc
Fix phpcs
2020-11-02 16:37:50 +01:00
Laurent Destailleur
83a7b19333
Look and feel v13
2020-11-02 11:41:07 +01:00
Frédéric FRANCE
0e7b1ff1c7
doxygen
2020-11-01 15:39:01 +01:00
Frédéric FRANCE
e52b79d586
Merge remote-tracking branch 'upstream/develop' into zapieruser
2020-11-01 14:19:06 +01:00
Laurent Destailleur
4f09b87ec5
Merge pull request #15245 from frederic34/patch-10
...
fix vcard birthday of member
2020-11-01 13:53:14 +01:00
Laurent Destailleur
47a4d2c9f6
Merge pull request #15244 from frederic34/patch-8
...
doxygen
2020-11-01 13:52:15 +01:00
Frédéric FRANCE
7b8c05250f
fix vcard birthday of member
2020-11-01 09:13:02 +01:00
Frédéric FRANCE
26406b0f9f
Update adherent.class.php
2020-11-01 08:56:56 +01:00
Frédéric FRANCE
c2781d5551
doxygen
2020-11-01 08:54:12 +01:00
Frédéric FRANCE
07432779d9
doxygen
2020-11-01 08:48:53 +01:00
Frédéric FRANCE
49390a596c
Merge remote-tracking branch 'upstream/develop' into zapieruser
2020-10-31 20:33:59 +01:00
Scrutinizer Auto-Fixer
ab25e047c0
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 17:51:30 +00:00
Frédéric FRANCE
be4a4cb54b
Merge remote-tracking branch 'upstream/develop' into zapieruser
2020-10-31 16:10:16 +01:00
Scrutinizer Auto-Fixer
7f52920716
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 13:32:18 +00:00
Laurent Destailleur
f485ebc2cf
Removed dead code
2020-10-31 12:56:30 +01:00
Frédéric FRANCE
2cbbf86a5b
Merge remote-tracking branch 'upstream/develop' into zapieruser
2020-10-30 17:48:00 +01:00
Frédéric FRANCE
b431d99996
Update api_memberstypes.class.php
2020-10-30 16:10:23 +01:00
Frédéric FRANCE
38c2fea849
Update api_members.class.php
2020-10-30 15:21:28 +01:00
Frédéric FRANCE
6fe4f85eec
work on members
2020-10-30 08:15:37 +01:00
Frédéric FRANCE
1c9cd484ad
work on members
2020-10-30 08:10:28 +01:00
Frédéric FRANCE
ec6568ffbe
work on members
2020-10-30 08:01:58 +01:00
Frédéric FRANCE
f721338bd8
work on members
2020-10-30 07:57:53 +01:00
Frédéric FRANCE
79941a8dde
Update adherent.class.php
2020-10-28 19:10:54 +01:00
Frédéric FRANCE
b9f593b73a
Update adherent.class.php
2020-10-27 20:46:32 +01:00
Frédéric FRANCE
6d6b143011
Update adherent.class.php
2020-10-27 20:11:18 +01:00
Scrutinizer Auto-Fixer
a2a9c51e50
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-27 18:46:07 +00:00
Frédéric FRANCE
5a3780e062
end of dol_fiche_end
2020-10-27 18:19:31 +01:00
Frédéric FRANCE
d3c87dabab
display members
2020-10-26 21:51:17 +01:00
Frédéric FRANCE
42f5fd7d5f
display last members like on list
2020-10-26 21:38:16 +01:00
Laurent Destailleur
6fa174d13f
Merge pull request #15051 from laudeco/feature/11878_select_bank_account
...
11878 - select the only bank account
2020-10-25 14:56:08 +01:00
Laurent De Coninck
1d62834b2c
use the second version for default bank account
2020-10-24 17:15:48 +02:00
Frédéric FRANCE
ae3228b9e0
retrieve the spelling 🎉
2020-10-23 20:08:35 +02:00
Frédéric FRANCE
9a470fa42d
replace deprecated
2020-10-22 22:50:03 +02:00
Philippe GRAND
a2b3dbd8f8
fix : deprecated
2020-10-22 16:47:35 +02:00
Philippe GRAND
dc0d9e46b8
fix : deprecated
2020-10-22 16:46:45 +02:00
Philippe GRAND
74fc38395c
fix : deprecated
2020-10-22 16:44:26 +02:00
Laurent De Coninck
d2e2cad028
select by default, remove the show empty everywhere the field is required
2020-10-17 21:15:52 +02:00
Laurent Destailleur
a0b17635fd
NEW When creating a user from a member linked to a thirdparty, you can
...
decide if it is an internal or external (default) user.
2020-10-14 14:02:07 +02:00
Scrutinizer Auto-Fixer
1512521d91
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-07 13:01:28 +00:00
Laurent Destailleur
e3542c6d4f
Merge pull request #14848 from TobiasSekan/ShowCategoryInListOnlyWithRights
...
NEW Show category filter on lists only when user have rights to read categories
2020-10-06 12:29:10 +02:00
Laurent Destailleur
7b3a7c9921
Add token on all url with action=delete
2020-10-01 10:50:54 +02:00
Laurent Destailleur
f442dac2c9
Add token on most GET url for admin action
2020-09-30 15:13:28 +02:00
Laurent Destailleur
29414251f5
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/lib/files.lib.php
2020-09-29 13:19:03 +02:00
Laurent Destailleur
628978be53
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/adherents/card.php
2020-09-28 21:16:25 +02:00
Sekan, Tobias
2bf15b3a92
Show category filter only on rights to read it
2020-09-28 10:42:49 +02:00
Laurent Destailleur
3ee2459dc7
Enhancement for #14835 : Can filter on expiration date, add list of
...
members without subscriptions
2020-09-27 16:03:20 +02:00
Laurent Destailleur
3c6dda9dd5
Clean code
2020-09-25 10:27:30 +02:00
Laurent Destailleur
e52559783f
Look and feel v13
2020-09-21 13:54:26 +02:00
Laurent Destailleur
9f41f90eeb
Fix responsive
2020-09-21 01:28:26 +02:00
daraelmin
b3d386fa54
Fix Category is lost on sorting member list
...
When sorting member list filter by tag/category the criteria is lost because of one missing GET parameter
Just adding a GET parameter to keep the category/tag parameter when sorting the list
2020-09-20 08:42:25 +02:00
Laurent Destailleur
216b3c885d
Fix escaping
2020-09-20 01:30:36 +02:00
Laurent Destailleur
7dd69a2b2b
Fix escape
2020-09-19 20:11:04 +02:00
Laurent Destailleur
2d38644ae1
Sanitize sortfield
2020-09-18 17:13:01 +02:00
Laurent Destailleur
cddec2f4dc
Fix XSS
2020-09-18 13:25:56 +02:00
Laurent Destailleur
b35db6b9dd
Clean code managing canvas
2020-09-18 06:02:52 +02:00
Laurent Destailleur
c4b5f5a249
Maxi clean of code
2020-09-18 01:29:17 +02:00
Laurent Destailleur
9a758b7edd
FIX #yogosha4483
2020-09-17 14:31:25 +02:00
Alexandre SPANGARO
55e3f8365e
FIX Yogosha report 4434 (backport)
2020-09-16 21:36:55 +02:00
Laurent Destailleur
bfbb217607
Fix GETPOST on 'action'
2020-09-16 19:39:50 +02:00
Laurent Destailleur
7b8a206730
FIX #yogosha
2020-09-16 17:48:59 +02:00
Laurent Destailleur
4224e5da41
Merge pull request #14729 from bafbes/abb120143
...
allow access to adherent_extrafields table fields in printFieldListWhere hook
2020-09-16 01:14:01 +02:00
Laurent Destailleur
b7d56cbfbf
Fix syntax error
2020-09-16 01:09:54 +02:00
Laurent Destailleur
b5cac258bf
Merge pull request #14739 from defrance/patch-155
...
Users can now have non-binary gender
2020-09-16 00:54:07 +02:00
Laurent Destailleur
7e941ff5ac
Merge pull request #14747 from daraelmin/develop
...
FIX #14746 Historical list of subscription shows empty member type
2020-09-16 00:49:41 +02:00
Laurent Destailleur
5c31593d43
Add date of birth in candidatures
2020-09-16 00:47:44 +02:00
daraelmin
8b928a110e
FIX #14746
...
Historical list of subscription shows empty member type if not recorded
2020-09-15 22:23:22 +02:00
BENKE Charlene
1d0dc7cab0
Update list.php
2020-09-15 11:31:29 +02:00
BENKE Charlene
b01a68abef
Update card.php
2020-09-15 11:30:47 +02:00
Laurent Destailleur
b20be7074e
phpcs
2020-09-14 04:08:11 +02:00
Laurent Destailleur
dd06ff3a0d
Label
2020-09-14 03:41:18 +02:00
Laurent Destailleur
419ac91a7a
FIX #14538
2020-09-14 03:34:03 +02:00
Laurent Destailleur
59bc8ee07c
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/stats/byproperties.php
htdocs/adherents/stats/geo.php
htdocs/admin/system/dolibarr.php
htdocs/core/class/commonobjectline.class.php
htdocs/core/tpl/objectline_title.tpl.php
htdocs/langs/en_US/admin.lang
htdocs/product/class/product.class.php
2020-09-14 02:49:19 +02:00
Laurent Destailleur
701b83db38
FIX Bad number of subscription (forgotten when member was resiliated)
2020-09-14 02:38:12 +02:00
Laurent Destailleur
b2288ad2d9
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-09-14 02:33:00 +02:00
Laurent Destailleur
a891211f78
Fix bad link
2020-09-14 02:32:30 +02:00
bahfir abbes
c5fa6eac58
allow access to adherent_extrafields table fields in printFieldListWhere hook;
2020-09-13 21:02:04 +01:00
Laurent Destailleur
b8fe2188a6
Standardize code around model_pdf
2020-09-10 01:49:09 +02:00
Scrutinizer Auto-Fixer
b78ff67d7e
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-09-07 08:18:17 +00:00
bahfir abbes
47eee354f8
new : option to hide complementary actions
2020-09-01 19:31:44 +01:00
ptibogxiv
a64223f73d
Update api_members.class.php
2020-08-29 12:44:17 +02:00
stickler-ci
96b3474185
Fixing style errors.
2020-08-29 10:40:30 +00:00
ptibogxiv
7fe83b24ba
NEW api get member by thirdparty
2020-08-29 12:38:22 +02:00
Laurent Destailleur
9c74211873
Merge pull request #14508 from b92/develop
...
NEW Add __TYPE__ substitution key
2020-08-23 18:09:49 +02:00
Bernard Saulme
d947ade7db
Update adherent.class.php
...
NEW Add _TYPE__ substitution key
2020-08-19 21:19:56 +02:00
Laurent Destailleur
e65e4a6d47
Beautify for of member module
2020-08-18 11:52:00 +02:00
Laurent Destailleur
4c1aa25b32
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/admin/adherent_emails.php
htdocs/core/tpl/extrafields_list_search_title.tpl.php
htdocs/product/traduction.php
2020-08-04 13:51:11 +02:00
Laurent Destailleur
9a5d0ab0a2
FIX #14236
2020-08-04 13:48:11 +02:00
florian HENRY
e44a1fd33f
->error rather than dol_print_error into product
2020-07-31 16:09:38 +02:00
Laurent Destailleur
8109145fe3
Merge pull request #14162 from laurantines/develop
...
Update list.php in Adherents
2020-07-03 00:24:54 +02:00
laurantines
a34c6ec7b0
Update list.php in Adherents
...
Add Address in search
2020-07-01 13:12:52 +02:00
Laurent Destailleur
333d4873c3
Properties ->contactid has been renamed into ->contact_id
2020-06-25 12:17:47 +02:00
Laurent Destailleur
6d25b8630b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/prelevement.php
htdocs/core/class/rssparser.class.php
2020-06-23 11:38:20 +02:00
Laurent Destailleur
058a0d4fa7
Fix look and feel v12
2020-06-22 04:27:16 +02:00
Laurent Destailleur
77c1c46285
Merge pull request #14032 from ptibogxiv/patch-343
...
NEW convert all subscription in datetime
2020-06-12 00:47:55 +02:00
ptibogxiv
37007d6d1a
Update subscription.class.php
2020-06-07 16:12:28 +02:00
Laurent Destailleur
4e4e7a38c3
Merge pull request #14041 from bb2a/VCARD
...
NEW add vcard for aderent and user
2020-06-06 20:58:37 +02:00
Laurent Destailleur
da672c8776
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
htdocs/admin/translation.php
htdocs/core/class/html.formfile.class.php
htdocs/societe/card.php
2020-06-06 11:57:31 +02:00
Laurent Destailleur
a305c43901
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/societe/card.php
htdocs/ticket/card.php
2020-06-06 11:51:39 +02:00
Laurent Destailleur
2344435416
Fix XSS CWE-ID CWE-79
2020-06-05 23:41:29 +02:00
Anthony Berton
ee10c6f10b
vcard
2020-06-05 17:57:13 +02:00
Laurent Destailleur
2836368017
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/filefunc.inc.php
htdocs/takepos/css/phone.css
htdocs/takepos/invoice.php
2020-05-28 20:20:39 +02:00
Laurent Destailleur
3606ed2bda
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/adherents/class/adherent.class.php
2020-05-28 20:17:26 +02:00
Florian Mortgat
d491f2cf54
[pgsql] type of llx_adherent_type.subscription is VARCHAR(3) so quotes are mandatory
2020-05-27 18:27:10 +02:00
Laurent Destailleur
ab176cd078
Merge pull request #13937 from frederic34/Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
...
add new rule
2020-05-26 00:20:12 +02:00
laurantines
416d1d0301
Update list.php
...
Search by d,phone, d.phone_perso, d.phone_mobile in SELECT QUERY
2020-05-25 22:53:03 +02:00
laurantines
962d795740
Update list.php
...
Search by d,phone, d.phone_perso, d.phone_mobile in SELECT QUERY
2020-05-25 12:26:05 +02:00
Frédéric FRANCE
f4011520a3
add new rule
2020-05-21 09:31:49 +02:00
Frédéric FRANCE
ba8cf2b398
add new rule
2020-05-21 09:21:30 +02:00
Frédéric FRANCE
ccc859ec80
add new rule
2020-05-21 09:12:18 +02:00
Frédéric FRANCE
ccadb1ec7a
add new rule
2020-05-21 00:47:16 +02:00
Frédéric FRANCE
43dcd9beb5
add new rule
2020-05-21 00:02:33 +02:00
Laurent Destailleur
4584fa1aa6
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/asset/list.php
htdocs/compta/bank/list.php
htdocs/contrat/services_list.php
htdocs/core/lib/date.lib.php
htdocs/expensereport/list.php
htdocs/fichinter/list.php
htdocs/holiday/list.php
htdocs/projet/tasks/list.php
htdocs/supplier_proposal/list.php
htdocs/user/list.php
2020-05-11 19:43:06 +02:00
Laurent Destailleur
7300b45bcd
Responsive
2020-05-11 01:19:33 +02:00
Maxime Kohlhaas
1a9afe6b20
Fix missing hook params for printFieldListValue
2020-05-08 01:40:25 +02:00
Laurent Destailleur
b426bbe758
Fix bad code
2020-04-25 17:47:41 +02:00
Laurent Destailleur
3ed11f374a
Look and feel v12
2020-04-24 23:56:57 +02:00
Laurent Destailleur
72c6ac1c72
Complete #13708 , normalization of code
2020-04-23 13:21:39 +02:00
Josep Lluís
e1f1e2bf97
FIX type member extrafields are duplicated on edit
...
type member extrafields are duplicated on edit, and old usage on create (without tpl)
2020-04-20 17:50:19 +02:00
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
