Commit Graph

3348 Commits

Author SHA1 Message Date
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