Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
106,361 Commits 36 Branches 189 Tags
eda401dea02db251f1a5730b1f07a856665f359d
Commit Graph

2136 Commits

Author SHA1 Message Date
Laurent Destailleur
3653e8244b NEW Implement the generic method for Kaban views 2022-02-09 13:22:23 +01:00
Laurent Destailleur
f2120a6463 Merge pull request #19994 from defrance/patch-177 
fix : duration in hour and min (not in second)
 2022-02-06 12:35:59 +01:00
Laurent Destailleur
d1f3411bac Update list_print_total.tpl.php 2022-02-06 12:35:33 +01:00
BENKE Charlene
9977761846 print the good format of totalisation 2022-02-05 12:12:37 +01:00
Laurent Destailleur
c9a685e09d Better error message 2022-02-04 19:21:47 +01:00
Laurent Destailleur
5942bc57e6 Add DDOS protection 2022-01-30 01:03:07 +01:00
Laurent Destailleur
728df13238 Optimize files loaded on login and passwordforgotten page 2022-01-29 16:22:55 +01:00
Laurent Destailleur
13f66df975 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-25 15:43:57 +01:00
Laurent Destailleur
c3a58ae303 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-25 15:43:42 +01:00
Laurent Destailleur
bb49dd195e Merge pull request #19722 from bjoern86/patch-2 
Adds possibility to add senders name to $formmail->fromname
 2022-01-25 14:58:27 +01:00
Laurent Destailleur
b7b88865e6 Update card_presend.tpl.php 2022-01-25 14:58:00 +01:00
Laurent Destailleur
0e8b7ef656 Clean code 2022-01-24 16:38:25 +01:00
Laurent Destailleur
a16293f9b7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-22 17:27:57 +01:00
Laurent Destailleur
1dcfb88ad4 Debug v15 2022-01-21 13:44:40 +01:00
Laurent Destailleur
3ae63cb111 Clean code 2022-01-19 22:49:53 +01:00
Laurent Destailleur
d38784f45a WIP Login with Google 2022-01-19 20:33:20 +01:00
Laurent Destailleur
60b90056c4 Fix #yogosha8450 2022-01-19 15:20:10 +01:00
Laurent Destailleur
12044fa67a Debug v15 2022-01-10 03:24:01 +01:00
bjoern86
cab4b762d3 Adds possibility to add senders name to $formmail->fromname 
If INVOICE_EMAIL_SENDER_NAME, SHIPPING_EMAIL_SENDER_NAME, COMMANDE_EMAIL_SENDER_NAME or ORDER_SUPPLIER_EMAIL_SENDER_NAME is beeing set, use it as sender name. If not, keep $formmail->fromname blank
 2022-01-01 20:24:30 +01:00
Laurent Destailleur
c5bdb7b4d8 Revert "Update card_presend.tpl.php" 2021-12-16 17:29:04 +01:00
Laurent Destailleur
0e593d9e8b Merge branch 'develop' into patch-2 2021-12-16 17:28:07 +01:00
Laurent Destailleur
b604199d0e Merge pull request #19635 from AlainRnet/patch-9 
Update notes.tpl.php
 2021-12-16 17:01:44 +01:00
Laurent Destailleur
84400cf1d3 Fix backto page 2021-12-16 13:35:17 +01:00
Alain Rihs
32ef42d163 Update notes.tpl.php 
See https://github.com/Dolibarr/dolibarr/issues/19580

The options of the advanced editor were not taken into account when editing public and private notes. I propose this code to fix this bug.
 2021-12-16 10:22:43 +01:00
Frans Bosman
8c844c96df Update card_presend.tpl.php 
Add hidden feature ORDER_SUPPLIER_EMAIL_SENDER as sender address for purchase order emails
 2021-12-13 20:33:42 +01:00
Laurent Destailleur
689f5dd1fe Fix use of reposition when nojs for confirmation popup 2021-12-11 18:13:03 +01:00
Laurent Destailleur
1122cd1e5e Merge pull request #19163 from Hystepik/develop#4 
Fix: php 8.0 warnings project
 2021-11-30 14:18:23 +01:00
Laurent Destailleur
186185267e Clean code for v15 2021-11-29 00:49:18 +01:00
Laurent Destailleur
ee14aa2597 Fix: Do not loose data on error when editing a line 2021-11-23 12:11:27 +01:00
Laurent Destailleur
441af6b6fb Fix add rel="noopener noreferrer" 2021-11-22 02:35:55 +01:00
Laurent Destailleur
59de140366 css 2021-11-19 23:39:25 +01:00
lmarcouiller
00369a5269 fix errors 2021-11-19 14:32:40 +01:00
Hystepik
63773bf36d Merge branch 'develop' into develop#4 2021-11-19 14:22:39 +01:00
Nicolas Domenech
61d97ccd22 NEW : redirect after connection in login page 2021-11-05 16:02:24 +01:00
Frédéric FRANCE
7d60cddaac fix warning 
same test at line 65
 2021-10-31 19:36:31 +01:00
Laurent Destailleur
d21278b0ef Merge branch 'develop' into fix_php8 2021-10-31 17:54:32 +01:00
Laurent Destailleur
6a4344af8a Merge pull request #19187 from frederic34/patch-8 
fix warning
 2021-10-31 17:51:16 +01:00
Frédéric FRANCE
787cef4440 fix warnings 2021-10-28 20:34:05 +02:00
Laurent Destailleur
d1794d7948 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modAdherent.class.php
 2021-10-28 11:05:38 +02:00
Laurent Destailleur
e85548d470 Fix look and feel v14 2021-10-27 03:06:50 +02: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
Florian HENRY
52a4f4869d Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_php8 2021-10-25 16:54:30 +02:00
Laurent Destailleur
d916fe121a css 2021-10-25 13:57:02 +02:00
Laurent Destailleur
15c80327b1 data-key for extrafielsds has prefix of element 2021-10-25 13:29:08 +02:00
Frédéric FRANCE
03a8c5f0cb Update commonfields_edit.tpl.php 2021-10-24 19:21:58 +02:00
Frédéric FRANCE
72a665b901 fix warning 2021-10-24 19:19:32 +02:00
Lucas Marcouiller
58b28d3d7d Fix: fix php 8.0 warnings project 2021-10-23 22:32:03 +02:00
Florian HENRY
bb4eb2feea Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_php8 2021-10-22 23:38:44 +02:00
Laurent Destailleur
d54423990d Merge pull request #19077 from polkiko/email_contentlines 
FIX Content line substitution in email
 2021-10-22 15:37:45 +02:00
polkiko
fd64f8966b Fixed in-line substitution if there is no object 2021-10-22 15:19:11 +02:00