Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-03 15:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
101,988 Commits 37 Branches 191 Tags
b56eaf91e892f39252b1d431fd71eb082002fa85
Commit Graph

794 Commits

Author SHA1 Message Date
stickler-ci
87b4805bc0 Fixing style errors. 2021-10-22 13:35:30 +00:00
atm-lena
fa21b27ced Validate Holiday : keep files 2021-10-22 15:27:16 +02:00
Laurent Destailleur
04fa5ff70b css 2021-09-30 01:50:11 +02:00
Laurent Destailleur
5b07be0179 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/holiday/list.php
 2021-09-16 13:33:49 +02:00
Laurent Destailleur
77247ec43a Add date valid/approval 2021-09-09 20:35:57 +02:00
Laurent Destailleur
f4786c8a0a Include ref into label of log history 
Conflicts:
	htdocs/holiday/card.php
 2021-09-09 19:50:39 +02:00
Laurent Destailleur
6465e8aa36 Include ref into label of log history 2021-09-09 19:47:51 +02:00
Laurent Destailleur
b8b5b97d78 Code comment 2021-09-09 19:47:15 +02:00
Laurent Destailleur
d3de81fecb Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/holiday/card.php
	htdocs/holiday/class/holiday.class.php
 2021-08-22 19:34:13 +02:00
Laurent Destailleur
53a6e0cfaf Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-08-22 19:23:56 +02:00
Laurent Destailleur
fe17c13a5f FIX an approved holiday can be canceled by an admin. 2021-08-22 19:22:47 +02:00
Laurent Destailleur
ae3a0fce71 Fix phpcs 2021-08-18 02:16:30 +02:00
Laurent Destailleur
57c9649b50 FIX bad approver shown on holiday once approved 2021-08-18 00:12:25 +02:00
Laurent Destailleur
a19f8cd87d Merge pull request #18337 from atm-maxime/fix_holidays_users 
Fix : we only want employee users for holidays
 2021-08-17 18:37:38 +02:00
Laurent Destailleur
ef4468153d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/extrafields_list_search_sql.tpl.php
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2021-08-11 22:07:13 +02:00
Laurent Destailleur
0cf2164260 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2021-08-11 21:15:30 +02:00
Marc de Lima Lucio
864a8b4b3e FIX: holiday card: hooks uninitialized 2021-08-06 16:22:19 +02:00
Maxime Kohlhaas
803722e323 Fix : we only want employee users for holidays 2021-08-04 14:48:10 +02:00
Laurent Destailleur
4c505619e3 FIX look and field v14 2021-07-23 00:02:14 +02:00
Laurent Destailleur
b552c6b4fe Fix status color 2021-07-14 14:32:05 +02:00
Laurent Destailleur
37801184c0 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/holiday/class/holiday.class.php

Fix case of newByMonth
 2021-07-06 15:35:17 +02:00
Laurent Destailleur
4dd29af555 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-07-06 15:24:37 +02:00
Laurent Destailleur
a345d38320 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-07-06 15:24:01 +02:00
Marc de Lima Lucio
eea90cef56 FIX: holiday: balances not updated correctly with pgsql because of case sensitivity 2021-07-05 16:31:33 +02:00
Laurent Destailleur
8a3b92a32d Fix filter 2021-07-03 18:30:58 +02:00
Marc de Lima Lucio
97938f489e FIX: holiday: status filter parameter has been renamed but not in links it was used 2021-07-02 11:35:26 +02:00
Laurent Destailleur
3ff4f7c722 Merge pull request #17959 from dolibit-ut/patch-360 
Update month_report.php
 2021-06-17 13:30:15 +02:00
Laurent Destailleur
378184564a Merge pull request #17957 from dolibit-ut/patch-358 
Update define_holiday.php
 2021-06-17 13:30:03 +02:00
Laurent Destailleur
70309d8a3e Merge pull request #17956 from dolibit-ut/patch-357 
Update card.php
 2021-06-17 13:29:52 +02:00
Laurent Destailleur
2f4f8648af Merge pull request #17960 from dolibit-ut/patch-361 
Update view_log.php
 2021-06-17 13:29:09 +02:00
UT from dolibit
23b24c589e Update view_log.php 
$title
 2021-06-17 09:15:24 +02:00
UT from dolibit
789a2744f2 Update month_report.php 
$title
 2021-06-17 09:13:54 +02:00
UT from dolibit
c1297d561d Update document.php 2021-06-17 09:11:07 +02:00
UT from dolibit
e62e6d9696 Update define_holiday.php 
$title
 2021-06-17 09:08:59 +02:00
UT from dolibit
053f8f8338 Update card.php 2021-06-17 09:07:17 +02:00
Laurent Destailleur
f6274b8418 Fix nb of holidays can be float 2021-06-15 16:29:42 +02:00
Laurent Destailleur
988dbd25b3 Fix sql syntax error 2021-06-14 14:24:18 +02:00
Laurent Destailleur
5cc86d2319 Fix #yogosha6370 2021-06-14 13:51:09 +02:00
Laurent Destailleur
1bf63c7862 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/core/lib/functions.lib.php
 2021-06-10 16:53:09 +02:00
Laurent Destailleur
24f8b6386e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2021-06-10 16:47:45 +02:00
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00
Marc de Lima Lucio
5d9aa40065 FIX: holiday list: bad right for mass deletion 2021-06-09 12:40:34 +02:00
Laurent Destailleur
fa4786a3f6 Fix permission 2021-06-08 16:19:21 +02:00
Laurent Destailleur
e5ab721660 Fix sanitize 2021-06-04 12:30:46 +02:00
Laurent Destailleur
08b44b3348 Merge pull request #17755 from frederic34/patch-17 
fix warning
 2021-06-04 11:54:58 +02:00
Laurent Destailleur
2586fcd1a3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commandestats.class.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/holiday/month_report.php
	htdocs/product/class/product.class.php
	htdocs/product/stock/class/mouvementstock.class.php
	htdocs/societe/list.php
 2021-06-04 11:20:38 +02:00
Laurent Destailleur
6c8341a43f Merge pull request #17787 from Hystepik/develop#5 
Fix #17726 : holliday with advanced perms works
 2021-06-04 09:37:32 +02:00
Gauthier PC portable 024
093705a1b5 FIX : field name is search_status and not search_statut 2021-06-03 11:32:41 +02:00
Laurent Destailleur
1468761073 Fix select 2021-06-02 16:29:38 +02:00
Laurent Destailleur
da7d821a3e css 2021-06-02 15:32:39 +02:00