2
0
forked from Wavyzz/dolibarr
Commit Graph

2872 Commits

Author SHA1 Message Date
Laurent Destailleur
d55fde4633 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-11-08 18:49:53 +01:00
Laurent Destailleur
621f0812a1 Merge pull request #19304 from daraelmin/daraelmin-patch-3
Fix default enddate subscription must be in futur
2021-11-08 03:28:35 +01:00
Laurent Destailleur
29bf662cc4 Fix warnings 2021-11-07 19:01:44 +01:00
Laurent Destailleur
dd2207d6c5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/customer/list.php
	htdocs/core/db/DoliDB.class.php
	htdocs/resource/list.php
2021-11-06 21:11:05 +01:00
daraelmin
9d7f7e2090 Better condition 2021-11-05 14:03:56 +01:00
Laurent Destailleur
15bc4a7d6b Update index.php 2021-11-05 13:18:37 +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