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

2232 Commits

Author SHA1 Message Date
Laurent Destailleur
e8a9a7b732 Responsive 2022-03-26 10:02:20 +01:00
Laurent Destailleur
8d2d0f1e84 Fix trans 2022-03-25 12:22:52 +01:00
Marc de Lima Lucio
1c43617d93 FIX: contact card: single extrafield update failed 2022-03-24 17:34:50 +01:00
Laurent Destailleur
02e2f9815d NEW Add option INVOICEREC_SET_AUTOFILL_DATE_START/END 2022-03-22 11:47:25 +01:00
Laurent Destailleur
d2005a3bb9 Fix regression on extrafields not visible 2022-03-16 15:40:17 +01:00
ATM john
53f4fd2af8 Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14.0_fix_regression_selct_extrafield_search 2022-03-16 10:44:15 +01:00
ATM john
5e644ed0a4 Fix search degradation 2022-03-15 18:24:49 +01:00
Laurent Destailleur
88ffe1827e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/ajax/row.php
	htdocs/filefunc.inc.php
 2022-03-10 15:59:09 +01:00
Gauthier PC portable 024
5b715978e4 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2022-03-10 10:02:57 +01:00
Laurent Destailleur
fb2fb46d17 FIX Drag and drop line of files on join files tab 2022-03-07 16:04:55 +01:00
Laurent Destailleur
2142440b6c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/langs/en_US/errors.lang
 2022-03-07 13:23:47 +01:00
Laurent Destailleur
f4cb5810a7 FIX list of visible type of event was not correctly filtered 
FIX Error management on mass action "Approve holiday"
 2022-03-07 12:01:34 +01:00
Laurent Destailleur
358f21f06e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/core/customreports.php
 2022-03-01 16:48:29 +01:00
Laurent Destailleur
2a48dd349e Fix #hunterb03d4415-d4f9-48c8-9ae2-d3aa248027b5 2022-03-01 16:38:06 +01:00
Laurent Destailleur
e4e08c9903 Code simpler to manage collapse of separators. 2022-03-01 04:02:06 +01:00
Laurent Destailleur
0d024147bf Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-28 22:36:31 +01:00
Laurent Destailleur
dfba29b3c6 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/api/class/api.class.php
	htdocs/compta/facture/card.php
	htdocs/reception/list.php
 2022-02-28 22:30:17 +01:00
Laurent Destailleur
67881a7932
Merge branch 'develop' into 16a12_assets_code 2022-02-28 22:03:26 +01:00
Laurent Destailleur
c2fb5d577c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/mysql/migration/14.0.0-15.0.0.sql
	htdocs/langs/en_US/banks.lang
	htdocs/projet/list.php
 2022-02-28 20:12:28 +01:00
stickler-ci
c2047f1f5d Fixing style errors. 2022-02-28 17:46:20 +00:00
atm-greg
bc8ea7571b perms can be an expression and must be evaluated 2022-02-28 18:38:37 +01:00
atm-greg
5eef80750a fiw visibility can be an expression and can return 0 2022-02-28 18:37:47 +01:00
Laurent Destailleur
488049c6a6 FIX bad position of extrafields for interventions 2022-02-25 20:36:40 +01:00
Laurent Destailleur
a6e7a41e98 FIX Reduce flash effect on collapse extrafield 
FIX Reduce flash effect on edit inline feature.
 2022-02-24 12:54:33 +01:00
Laurent Destailleur
cbf15af853
Merge pull request #20095 from Hystepik/develop#3 
Fix : fix php 8.0 warnings
 2022-02-17 19:12:39 +01:00
Laurent Destailleur
85327f28b0
Update login.tpl.php 2022-02-17 19:12:24 +01:00
Laurent Destailleur
3697cb9ca4 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/reception/class/reception.class.php
 2022-02-17 11:34:54 +01:00
lmarcouiller
aea9c2e427 Fix : fix php 8.0 warnings 2022-02-17 10:22:58 +01:00
stickler-ci
526157dfcb Fixing style errors. 2022-02-14 03:56:45 +00:00
Alexandre SPANGARO
6734a3575e Core 2022-02-14 04:52:39 +01:00
Laurent Destailleur
27df3cc02c FIX events on several days may missing the last day in calendar view. 
FIX the drag and drop was not available on some events
 2022-02-11 11:27:50 +01:00
Laurent Destailleur
77f1649adf
Merge pull request #20012 from atm-adrien/NEW_rec_invoices_15.0_newPR 
NEW Recurring vendor invoices
 2022-02-10 10:09:47 +01:00
Laurent Destailleur
3653e8244b NEW Implement the generic method for Kaban views 2022-02-09 13:22:23 +01:00
Adrien Raze
ee52cac3ba NEW : Template supplier invoices 2022-02-07 14:34:27 +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
Gauthier PC portable 024
3abe391f65 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2022-01-28 15:08:02 +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
Gauthier PC portable 024
6799d48944 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2022-01-11 09:59:25 +01:00
Gauthier PC portable 024
1910423684 FIX : conf name is MAIN_ADD_LINE_AT_POSITION 2022-01-11 09:54:27 +01:00
Gauthier PC portable 024
04cc0a0480 NEW : Add column "Total HT" to products array on document creation card 2022-01-10 17:02:15 +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
stickler-ci
9975587cd5 Fixing style errors. 2021-11-22 15:26:46 +00:00
Gauthier PC portable 024
e02405edc9 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2021-11-22 16:23:26 +01:00
Gauthier PC portable 024
9840c1e0fa Merge branch 'NEW/addline_with_position_choice' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop 2021-11-22 16:17:55 +01:00
Gauthier PC portable 024
e75b6ae0b4 FIX : it's better with an input number 2021-11-22 16:13:46 +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
Gauthier PC portable 024
72614ecc0d Merge branch 'NEW/addline_with_position_choice_develop' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop 2021-11-16 16:43:01 +01:00
Gauthier PC portable 024
375dcf7028 FIX : dev name 2021-11-16 16:42:48 +01:00
stickler-ci
19171d4f8e Fixing style errors. 2021-11-16 15:15:55 +00:00
Gauthier PC portable 024
9d41c1390d Merge branch 'NEW/addline_with_position_choice' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop 2021-11-16 14:20:24 +01:00
Gauthier PC portable 024
1e0d7d92a9 NEW : addline with position choice when MAIN_VIEW_LINE_NUMBER is enabled 2021-11-16 14:09:18 +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
Florian HENRY
b94d74f194 fix php8 warning 2021-10-22 14:58:09 +02:00
Polkiko
0c47a88098 FIX Content line substitution in email 2021-10-21 23:53:37 +02:00
Frédéric FRANCE
2eb524cc31
fix doxygen nested comment 2021-10-21 12:31:08 +02:00
Laurent Destailleur
0cae464bfa Debug v15 2021-10-19 16:47:43 +02:00