Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
108,518 Commits 35 Branches 179 Tags 1.7 GiB
0fd2e91ccc
Commit Graph

879 Commits

Author SHA1 Message Date
Laurent Destailleur
c96e3bdddf PHP v8 compatibility 2022-04-30 19:50:20 +02:00
Laurent Destailleur
cb15a21e41 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/originproductline.tpl.php
	htdocs/fourn/facture/card.php
	htdocs/install/mysql/migration/14.0.0-15.0.0.sql
	htdocs/user/card.php
 2022-04-11 21:22:27 +02:00
Laurent Destailleur
3ac268c200 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/core/lib/security.lib.php
	htdocs/holiday/card.php
	htdocs/user/card.php
 2022-04-11 21:14:51 +02:00
Laurent Destailleur
b8d1acaff7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/holiday/card.php
	htdocs/user/card.php
 2022-04-11 20:57:16 +02:00
Laurent Destailleur
baa4608812 Debug v16 2022-04-07 18:16:06 +02:00
Marc de Lima Lucio
de737b6b23 FIX: holiday/leave requests: write status change emails in HTML 2022-04-07 18:07:30 +02:00
Laurent Destailleur
ac22b1ce81 # WARNING: head commit changed in the meantime 
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
 2022-03-16 21:31:08 +01:00
Laurent Destailleur
d8bb5c2040 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-16 21:27:59 +01:00
Laurent Destailleur
4ad6425d76 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-03-16 21:27:34 +01:00
Laurent Destailleur
143660799b Clean code using dolGetFirstLineOfText() 2022-03-16 21:22:03 +01:00
Marc de Lima Lucio
8a8462bf57 FIX: holiday monthly report: html entity codes showing in description with WYSIWYG activated 2022-03-16 09:47:57 +01:00
Marc de Lima Lucio
9514062868 FIX: holiday monthly report: wrong 'Employee' and holiday type translations 2022-03-16 09:40:31 +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
409da7f091 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-25 19:17:41 +01:00
Laurent Destailleur
f8a5749fc4 # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
 2022-02-25 19:00:10 +01:00
Laurent Destailleur
e96061dd18 Fix phpunit SecurityTest 2022-02-22 23:46:57 +01:00
stickler-ci
19dbed1804 Fixing style errors. 2022-02-22 16:10:56 +00:00
lmarcouiller
65ecd2f3ef Fix : fix error of permission in holiday 2022-02-22 17:06:10 +01:00
Frédéric FRANCE
a613553f37
Merge branch 'hookgetnomurl' into patch-1 2022-02-15 18:44:06 +01:00
Frédéric FRANCE
0ba912b1e5
add missing global 2022-02-15 18:14:44 +01:00
Laurent Destailleur
86da9c610e
Merge pull request #17887 from marc-dll/develop_NEW_block_leave_if_negative_balance 
NEW: leave requests: add field into type dictionary to block request if balance is negative
 2022-02-04 20:23:04 +01:00
stickler-ci
1214ffaf3d Fixing style errors. 2022-01-28 01:32:44 +00:00
Anthony Berton
28e4cf5553
Update card.php 2022-01-28 02:30:49 +01:00
Anthony Berton
7fb0a78835
Update card.php 2022-01-28 02:30:04 +01:00
Laurent Destailleur
4200f2f195 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-01-14 14:02:30 +01:00
Laurent Destailleur
77c286b769 Fix permission 2022-01-14 14:01:50 +01:00
Laurent Destailleur
744296a43a FIX Permission on holiday and expensereport. 2022-01-14 13:52:08 +01:00
Laurent Destailleur
f04a07b6a7 FIX Pb with permission on holiday and expense report 2022-01-14 13:42:38 +01:00
Laurent Destailleur
13510b9929 Clean sortfield, sortorder 2022-01-13 11:17:25 +01:00
Laurent Destailleur
fbce09f21b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/compta/facture/card.php
	htdocs/reception/card.php
 2021-12-19 00:36:22 +01:00
Laurent Destailleur
98ddfbf792 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/compta/facture/info.php
	htdocs/compta/facture/list.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/pdf.lib.php
	htdocs/fourn/facture/list.php
	htdocs/mrp/mo_movements.php
	htdocs/product/stock/movement_card.php
	htdocs/product/stock/movement_list.php
	htdocs/product/stock/replenishorders.php
	htdocs/reception/card.php
	htdocs/supplier_proposal/list.php
 2021-12-19 00:17:37 +01:00
Laurent Destailleur
baa9585f85 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/lib/functions.lib.php
	htdocs/holiday/month_report.php
 2021-12-19 00:01:11 +01:00
Laurent Destailleur
494e9a2745
Merge branch 'develop' into develop_NEW_block_leave_if_negative_balance 2021-12-16 19:12:06 +01:00
kevin
a5b8d0cd4b FIX Take into consideration work leave over serveral months 2021-12-16 15:41:13 +01:00
Laurent Destailleur
1db52532ff FIX: do not update holiday for closed users 2021-12-03 01:50:17 +01:00
Laurent Destailleur
39ad96c230 css 2021-12-02 17:47:03 +01:00
stickler-ci
b212778da0 Fixing style errors. 2021-11-24 17:09:11 +00:00
Maximilian Stein
c33205d564 NEW: Show sum of holidays in holiday list 
Show a footer in the holidays list with the sum of all holidays
currently visible.
 2021-11-24 18:04:45 +01:00
Frédéric FRANCE
dc3bfcfb87
can modify tooltip by reference 2021-11-22 19:57:26 +01:00
Marc de Lima Lucio
bffd2fc939 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_NEW_block_leave_if_negative_balance 2021-11-19 16:12:33 +01:00
Alexandre SPANGARO
d611b99d95 GNU version 3 2021-11-09 03:01:48 +01:00
Christian Foellmann
58ae45a88b fix DocumentPreview on holiday documents 2021-11-04 13:58:38 +01:00
Laurent Destailleur
41b8c92311
Update card.php 2021-10-31 15:16:40 +01:00
Marc de Lima Lucio
fbb1fbf08e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_NEW_block_leave_if_negative_balance 2021-10-28 17:09:50 +02:00
Christian Foellmann
966b3ab85f use ref prefix for file uploads 2021-10-28 11:05:01 +02:00
Christian Foellmann
449e1821fc cleanup html and comment 2021-10-28 11:04:43 +02:00
Christian Foellmann
d93cf696e8 use FKEditor only if activated 2021-10-28 11:00:51 +02:00
Christian Foellmann
156f1e7e2a fix holiday page titles 2021-10-28 11:00:12 +02:00
Laurent Destailleur
ad2e567571 Fix bug huntr.dev 2021-10-25 15:32:10 +02:00