lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
109,623 Commits 43 Branches 150 Tags 886 MiB
develop
Commit Graph

2967 Commits

Author SHA1 Message Date
Regis Houssin
3fb0e3c5ad NEW add html.formldap.class.php 2021-11-03 22:56:15 +01:00
stickler-ci
586005ff2e Fixing style errors. 2021-11-03 21:43:30 +00:00
daraelmin
f9db196512
Update subscription.php 2021-11-03 22:31:45 +01:00
daraelmin
0e91b32e99
Update subscription.php 2021-11-03 20:40:09 +01:00
daraelmin
973f408b6e
Fix default enddate subscription must be in futur 2021-11-03 20:35:57 +01:00
daraelmin
b02c89bd8b
Add link year subscription list in subscription by year stats page 2021-11-02 23:07:46 +01:00
Frédéric FRANCE
d40e9bb304
remove old field 
field skype has been removed
 2021-11-01 13:52:06 +01:00
Laurent Destailleur
7dcd98b9bb
Merge pull request #19234 from hregis/fix_see_ldap_connected_server 
FIX show connected server if we have a primary and secondary ldap server
 2021-11-01 02:46:28 +01:00
Laurent Destailleur
d5130f2541 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop FIX #19013
 2021-11-01 02:16:50 +01:00
Regis Houssin
f497492e62 FIX compatibility with php8 2021-10-28 15:40:05 +02:00
stickler-ci
02b2ed3f05 Fixing style errors. 2021-10-25 20:08:01 +00:00
Scrutinizer Auto-Fixer
5567310e44 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2021-10-25 20:07:31 +00:00
Laurent Destailleur
757d841f15 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-23 17:20:00 +02:00
Laurent Destailleur
8604f9b153 Clean DOM (remove ficheaddleft div) 2021-10-23 17:18:35 +02:00
Philippe GRAND
9bef4d73cb Fix scrutinizer : The property other does not seem to exist on AdherentType. 2021-10-23 15:32:16 +02:00
Laurent Destailleur
900d7512f2
Merge pull request #19121 from frederic34/fixrightswarning 
fix multiple warnings
 2021-10-22 22:47:28 +02:00
Frédéric FRANCE
46c4f28478
fix multiple warnings 2021-10-22 22:15:59 +02:00
Laurent Destailleur
bf098330fe
Merge pull request #19114 from nicolas-eoxia/fix_creation_new_member 
fix: error on the creation of a new member #19112
 2021-10-22 18:59:24 +02:00
Nicolas Domenech
d7dd54549a fix: error on the creation of a new member 2021-10-22 16:34:51 +02:00
Laurent Destailleur
c81bf68578 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
	htdocs/compta/cashcontrol/cashcontrol_list.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/modulebuilder/index.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/product/class/api_products.class.php
 2021-10-22 15:56:44 +02:00
Laurent Destailleur
80aebef63f
Merge pull request #19024 from daraelmin/daraelmin-patch-5 
Fix adhtype amount as default on new subscription
 2021-10-21 23:48:58 +02:00
daraelmin
eed689e1c1
quote instead double quote 2021-10-20 16:33:38 +02:00
daraelmin
a2adc6fc58
Getpostisset 2021-10-20 15:59:42 +02:00
Laurent Destailleur
e43b33028c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
 2021-10-20 15:06:10 +02:00
Laurent Destailleur
562df7a27a
Merge pull request #19025 from daraelmin/daraelmin-patch-3 
Fix wrong const in select MEMBER_ALLOW_CHANGE_OF_TYPE
 2021-10-20 11:25:35 +02:00
Laurent Destailleur
b9540c3eb6 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	ChangeLog
	htdocs/adherents/card.php
	htdocs/filefunc.inc.php
	htdocs/install/repair.php
 2021-10-20 03:38:10 +02:00
daraelmin
dc465d6bac
Fix adhtype amount as default on new subscription 2021-10-20 00:29:46 +02:00
daraelmin
f4743c7f1f
Fix wrong const in select MEMBER_ALLOW_CHANGE_OF_TYPE 2021-10-19 23:00:36 +02:00
Laurent Destailleur
c40a73162e Look and feel v15 2021-10-18 21:20:58 +02:00
Laurent Destailleur
a81d6ef405 Debug v15 2021-10-18 19:13:36 +02:00
Laurent Destailleur
f1d646bded Look and feel v15 2021-10-18 15:41:55 +02:00
atm-florian
c016a20aac FIX 13.0 - due to a typo in the 'mode' parameter, the "first name" column of the list of members displays the full name 2021-10-18 12:12:38 +02:00
Laurent Destailleur
766ad9601e css 2021-10-17 13:45:28 +02:00
Laurent Destailleur
dd0809b528 Fix trans labels status 2021-10-16 19:37:57 +02:00
Maxime Kohlhaas
3c33770f00 Fix member creation from thirdparty extrafields 2021-10-13 15:30:49 +02:00
Alexandre SPANGARO
d10ec688c7 HTML5 - <font> tag is deprecated, replace by <span> 2021-10-05 09:03:13 +02:00
Laurent Destailleur
d064ab2b17 Add more action to GET action to check 2021-10-02 12:58:15 +02:00
Laurent Destailleur
673a2982a5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/opensurvey/card.php
 2021-09-30 16:32:40 +02:00
Laurent Destailleur
52fb627a64 Look and feel v14 2021-09-29 16:45:48 +02:00
Laurent Destailleur
37603b451a Fix token in url 2021-09-27 12:24:01 +02:00
Laurent Destailleur
d38c3028eb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expensereport/class/expensereport.class.php
 2021-09-23 02:41:53 +02:00
Laurent Destailleur
06f97f4f80 Look and feel v14 2021-09-21 12:04:28 +02:00
Laurent Destailleur
5c8fb38426 Fix add del* action into list of sensitive actions 2021-09-19 14:41:46 +02:00
Laurent Destailleur
96436cac3d FIX unprivileged user can attach agenda with leave. 2021-09-19 00:50:23 +02:00
Laurent Destailleur
d760686239 Fix case of newtoken() 2021-09-18 22:24:00 +02:00
Laurent Destailleur
0749d01c5a Fix add action delete* as sensitive action 2021-09-18 22:04:41 +02:00
Laurent Destailleur
8909702619 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/bom/class/bom.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/eventorganization.lang
	htdocs/product/class/productfournisseurprice.class.php
 2021-09-16 13:40:05 +02:00
Laurent Destailleur
4a2d3a55d4 FIX Selection of type "people" for membership must hide the company 2021-09-15 19:33:30 +02:00
Laurent Destailleur
3f7a75b0a3 FIX translation into email for member at membership validation. 2021-09-15 19:02:17 +02:00
Laurent Destailleur
bbacb4e740 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-13 02:45:00 +02:00
Frédéric FRANCE
5658c7daea
doxygen 2021-09-11 09:49:01 +02:00
Laurent Destailleur
ee066ad725 Cast sql var 2021-09-03 21:25:43 +02:00
Laurent Destailleur
8600d8d00d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-01 22:50:06 +02:00
Laurent Destailleur
207328c872 Example to fix the #18448 2021-09-01 19:45:46 +02:00
Laurent Destailleur
03cfea2504 Fix const setup 2021-09-01 19:06:58 +02:00
Laurent Destailleur
38c0e93285 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/core/class/commonobjectline.class.php
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/public/project/index.php
 2021-09-01 17:52:04 +02:00
Laurent Destailleur
bcd835ddbd Fix tooltips 2021-09-01 12:34:59 +02:00
Laurent Destailleur
da8dcaa0c9 Fix look and feel v14 2021-09-01 12:15:23 +02:00
Scrutinizer Auto-Fixer
312ca95feb Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2021-08-31 18:18:28 +00:00
Laurent Destailleur
d2d7b0defd Fix duplicate ; 2021-08-31 20:15:41 +02:00
Laurent Destailleur
0aa4868c34 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-31 13:14:01 +02:00
Laurent Destailleur
5549186e3a Fix link 2021-08-30 19:28:49 +02:00
Laurent Destailleur
7c9909ee12 Fix label of list of members 2021-08-30 19:21:52 +02:00
Laurent Destailleur
d9bfd72c29 Fix missing login in tooltip 2021-08-30 19:13:02 +02:00
Laurent Destailleur
d1ef4bdbd1 Fix missing login in tooltip 2021-08-30 19:10:43 +02:00
Laurent Destailleur
3c029d0ccf Fix sort on company on member list. 2021-08-30 18:57:41 +02:00
Laurent Destailleur
9db5f85d4e Fix responsive 2021-08-30 18:42:41 +02:00
Laurent Destailleur
9c3ba22b02 Fix label of company of a thirdparty 2021-08-30 18:38:31 +02:00
Laurent Destailleur
fb8723d884
Merge pull request #18487 from cfoellmann/PR/fix-remaining-buttons 
replace remaining SubmitCancel buttons
 2021-08-28 18:39:06 +02:00
Laurent Destailleur
c1d3ddf10b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-28 18:31:06 +02:00
Laurent Destailleur
6afe9c88f6
Merge pull request #18491 from daraelmin/patch-3 
Fix : conditiion always wrong when on following link
 2021-08-28 18:21:37 +02:00
Laurent Destailleur
1c1caaccde
Update member.php 2021-08-28 18:21:23 +02:00
Laurent Destailleur
c02fb6b9a8 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-28 03:15:47 +02:00
Laurent Destailleur
2dd91bf312 Clean code 2021-08-27 23:36:06 +02:00
Laurent Destailleur
46d993c9a6 Clean code 2021-08-27 22:42:04 +02:00
Laurent Destailleur
2f225ee7e5 Clean code by adding cast int. 2021-08-27 16:33:03 +02:00
Laurent Destailleur
d022b3b0a1 FIx #18481 2021-08-25 12:24:13 +02:00
daraelmin
701b43d917
Add MEMBER_ALLOW_CHANGE_OF_TYPE in admin panel 2021-08-25 09:01:30 +02:00
Christian Foellmann
f094b4c70c fix up most of the remaining submit inputs 2021-08-24 17:04:17 +02:00
Christian Foellmann
227f61a711 replace remaining SubmitCancel buttons 2021-08-24 16:10:20 +02:00
Laurent Destailleur
22339a3ed3
Merge pull request #18451 from cfoellmann/PR/form-buttons-function 
improve forms - buttonsSaveCreate()
 2021-08-24 15:26:03 +02:00
Laurent Destailleur
dc006b0ebb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2021-08-23 19:44:02 +02:00
Laurent Destailleur
d4b5ee6c85 Fix cast into variable into sql request. 2021-08-23 17:41:11 +02:00
Laurent Destailleur
4460206709 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-23 16:04:16 +02:00
Laurent Destailleur
21852bd16b Show link to invoices on member record 2021-08-23 15:25:41 +02:00
Laurent Destailleur
5f16de8150 Code comment 2021-08-23 15:08:29 +02:00
Laurent Destailleur
a25346e302 FIX Date of payment of subscription must not be set to 1970-01-01. 
Fix look and feel v14
 2021-08-23 15:00:29 +02:00
Christian Foellmann
d706c3b1ec use Forms::buttonsSaveCreate() to generate most of the Save|Cancel forms combination 2021-08-20 14:41:30 +02:00
Laurent Destailleur
cbdf121215
Merge branch 'develop' into dev_2 2021-08-17 19:20:42 +02:00
Laurent Destailleur
6f449cfd6c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-31 16:33:38 +02:00
Laurent Destailleur
2b2c8f076b
Merge pull request #18231 from ptibogxiv/patch-429 
Fix for php 8
 2021-07-28 17:37:07 +02:00
Laurent Destailleur
686c10e5be
Merge pull request #18236 from ptibogxiv/patch-434 
Fix for php8
 2021-07-28 17:31:45 +02:00
Laurent Destailleur
29a61164fe
Merge pull request #18237 from ptibogxiv/patch-435 
Fix subscription list
 2021-07-28 17:30:42 +02:00
ptibogxiv
053d72c306
fix for php8 2021-07-26 15:37:36 +02:00
ptibogxiv
76f0bac703
Fix subscription list 2021-07-26 15:29:46 +02:00
ptibogxiv
f83f02e4e2
Fix for php8 2021-07-26 15:24:58 +02:00
ptibogxiv
a181469ff8
Update type.php 2021-07-26 14:34:45 +02:00
ptibogxiv
cfdcad0077
Update type.php 2021-07-26 14:30:38 +02:00
ptibogxiv
a08b63d561
Fix for php 8 2021-07-26 14:29:42 +02:00
Givriz
3df4cd8857 Compatibility phpv8 2021-07-20 20:28:04 +02:00
Laurent Destailleur
d91051488c
Merge pull request #18125 from fr69400/develop 
NEW add hookmanager on note pages
 2021-07-11 20:25:16 +02:00
stickler-ci
c7e6f66823 Fixing style errors. 2021-07-11 07:43:02 +00:00
fr69400
5ec903723d
Update note.php 2021-07-11 09:42:35 +02:00
stickler-ci
4272f93aa4 Fixing style errors. 2021-07-09 16:41:41 +00:00
fr69400
e45d5c1d0d NEW add hookmanager on note pages 2021-07-09 18:36:21 +02:00
Laurent Destailleur
470f683d41 Clean code 2021-07-08 10:38:36 +02:00
Laurent Destailleur
5779a56ae0 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-04 21:23:53 +02:00
Laurent Destailleur
f6efe51032 Fix trouble with product id = -1 2021-07-04 21:02:02 +02:00
Laurent Destailleur
0cccfb1cee Fix phpcs v14 2021-07-04 19:23:04 +02:00
lmarcouiller
dcd4d53622 Fix php 8 warning in adherents list 2021-06-30 10:22:00 +02:00
Laurent Destailleur
2859ff46b5 Fix link of type of membership 2021-06-24 12:08:11 +02:00
damien clochard
05bb2c720d FIX #17996: Avoid implicit type casts for llx_adherent_type.subscription 
The llx_adherent_type.subscription column is VARCHAR so we need to
compare it with a string, not an int.
 2021-06-21 18:24:52 +02:00
Laurent Destailleur
21edb498c0
Merge pull request #17987 from daraelmin/daraelmin-patch-1 
Fix 17986 error on comparing integer and string in strict sql
 2021-06-20 17:26:56 +02:00
Laurent Destailleur
002471b1fe
Update adherentstats.class.php 2021-06-20 17:25:58 +02:00
daraelmin
cfd7c610db
Use dolSqlDateFilter instead of SQL function YEAR 2021-06-20 17:14:28 +02:00
daraelmin
a54a955a65
Use year() instead of date_format 2021-06-20 15:40:32 +02:00
daraelmin
831cc4f4b7
Fix 17986 error on comparing integer and string in strict sql 2021-06-20 14:19:05 +02:00
Laurent Destailleur
b026c28cee Hide pass 2021-06-18 13:20:55 +02:00
Laurent Destailleur
094315d708
Merge pull request #17926 from daraelmin/daraelmin-patch-1 
Clean code (use Adh constant and precise comment)
 2021-06-14 14:27:40 +02:00
Laurent Destailleur
5cc86d2319 Fix #yogosha6370 2021-06-14 13:51:09 +02:00
daraelmin
023453e73b
Update geo.php 2021-06-14 12:45:13 +02:00
daraelmin
8423ad823b
Update list.php 2021-06-14 12:41:32 +02:00
daraelmin
80f4278c42
Clean code 2021-06-14 12:24:58 +02:00
daraelmin
f5ec96bfce
Clean code (use Adh constant and precise comment) 2021-06-14 12:19:24 +02:00
Laurent Destailleur
f8f951977c Debug v14 2021-06-14 01:33:01 +02:00
Laurent Destailleur
34cebe6aa3 Look and feel v14 2021-06-14 01:11:39 +02:00
Laurent Destailleur
8b9af8f5ab Responsive 2021-06-13 01:27:04 +02:00
Laurent Destailleur
756786f717 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/compta/facture/list.php
	htdocs/core/class/discount.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/fourn/facture/card.php
	htdocs/holiday/list.php
	htdocs/paybox/admin/paybox.php
	htdocs/paypal/admin/paypal.php
	htdocs/product/price.php
	htdocs/projet/activity/perday.php
	htdocs/projet/activity/permonth.php
	htdocs/projet/activity/perweek.php
	htdocs/stripe/admin/stripe.php
 2021-06-11 19:05:05 +02:00
Laurent Destailleur
73a1119b26 Clean code 2021-06-11 15:21:24 +02:00
Laurent Destailleur
1bf63c7862 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/core/lib/functions.lib.php
 2021-06-10 16:53:09 +02:00
Laurent Destailleur
24f8b6386e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2021-06-10 16:47:45 +02:00
Laurent Destailleur
f3d54aada5 Clean code 2021-06-09 23:48:28 +02:00
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00
Laurent Destailleur
fa4786a3f6 Fix permission 2021-06-08 16:19:21 +02:00
Laurent Destailleur
facf594b2d FIX Date of invoice generated from membership must be current date 2021-06-08 16:01:26 +02:00
Laurent Destailleur
4f6a5cf5f7 Debug v14 2021-06-07 10:08:31 +02:00
Laurent Destailleur
9f177a0c63 Debug v14 2021-06-06 16:36:41 +02:00
Laurent Destailleur
a1bb7129da Debug v14 2021-06-06 15:29:49 +02:00
Laurent Destailleur
92b6425ce0 Debug v14 2021-06-05 18:20:07 +02:00
Laurent Destailleur
1e657b8621 Fix value of showoncombobox 2021-06-05 15:14:10 +02:00
ptibogxiv
36accba5c9
Fix date_start of last subscription 2021-06-05 14:43:40 +02:00
Laurent Destailleur
8d77f498a8
Merge pull request #17734 from frederic34/patch-7 
fix warning
 2021-06-04 12:42:36 +02:00
Laurent Destailleur
819e6e1122 Fix duplicate 2021-05-27 14:59:44 +02:00
Laurent Destailleur
a33f6a8977 css 2021-05-27 14:57:16 +02:00
Laurent Destailleur
cc0560c73d css 2021-05-27 14:47:06 +02:00
Laurent Destailleur
e7f9d317c3 css 2021-05-27 14:45:16 +02:00
Laurent Destailleur
e9cf33dac5 css 2021-05-27 14:35:20 +02:00
Frédéric FRANCE
60250443a1
fix warning 2021-05-26 18:55:48 +02:00
Frédéric FRANCE
371f2e4f37
fix warnings 2021-05-26 18:24:06 +02:00
Frédéric FRANCE
eec254f066
fix warning 2021-05-26 08:42:35 +02:00