lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
65,694 Commits 43 Branches 150 Tags 886 MiB
6cd5d12a31
Commit Graph

65694 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
florian HENRY
6cd5d12a31 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_scrunit 2018-03-21 08:34:31 +01:00
Laurent Destailleur
d647bf23d6 Css 2018-03-20 15:05:36 +01:00
Laurent Destailleur
d7ad899839 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/card.php
	htdocs/core/class/conf.class.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/holiday/list.php
 2018-03-20 14:52:27 +01:00
Laurent Destailleur
78b4492f1e FIX Permission in list of holiday 
Conflicts:
	htdocs/holiday/list.php
 2018-03-20 14:46:46 +01:00
Laurent Destailleur
8214e7bb42 Fix missing security restiction test 2018-03-20 14:32:24 +01:00
Laurent Destailleur
a12f884a7f FIX Permission in list of holiday 2018-03-20 14:31:33 +01:00
Laurent Destailleur
ca7122fe28 Fix responsive 2018-03-20 14:30:02 +01:00
Laurent Destailleur
76cceb59a9 Nead perm to read all for monthly report of leave requests 2018-03-20 13:54:52 +01:00
Laurent Destailleur
2fd212a560 NEW Report a list of leave requests for a month 2018-03-20 13:42:59 +01:00
Laurent Destailleur
67483eeb64 NEW Report a list of leave requests for a month 2018-03-20 13:42:29 +01:00
Laurent Destailleur
1fdad9182f Fix missing security restiction test 2018-03-20 11:47:58 +01:00
Laurent Destailleur
896a1cbc24 Fix bad var init 2018-03-20 11:27:47 +01:00
Laurent Destailleur
29775f735b Option MAIN_EXTRAFIELDS_IN_ONE_TD is now 1 2018-03-20 11:26:41 +01:00
Laurent Destailleur
8cf2d4eb45 Fix filter on holiday statut 
Fix tr/td balance for extrafields on lines
 2018-03-20 10:10:21 +01:00
Laurent Destailleur
a325bbf865 FIX Input of holiday for subordinates was ko 2018-03-19 20:46:43 +01:00
Laurent Destailleur
7948359bf7 Unlink picto differs from delete picto 2018-03-19 19:08:35 +01:00
Laurent Destailleur
0dc8d3cb00 Fix trad 2018-03-19 18:53:33 +01:00
Laurent Destailleur
0c45760dd4 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/step5.php
	htdocs/langs/en_US/holiday.lang
	htdocs/public/payment/newpayment.php
	htdocs/public/stripe/newpayment.php
 2018-03-19 17:58:19 +01:00
Laurent Destailleur
14e80948b8 FIX approval date was not visible if leave was canceled after 2018-03-19 17:53:33 +01:00
Laurent Destailleur
ee3dcb724f FIX email use the validate user instead of approver in holiday approval 
email.
 2018-03-19 17:20:44 +01:00
Laurent Destailleur
73eba91756 Fix translation of email message 2018-03-19 17:06:59 +01:00
Laurent Destailleur
91cc3d1b73 FIX navigation and filters on holiday list 2018-03-19 16:11:42 +01:00
Laurent Destailleur
e0164884ee Better management of hidden option HOLIDAY_HIDE_BALANCE 2018-03-19 15:13:36 +01:00
Laurent Destailleur
eb03fb7540 Fix trad/compatibility 2018-03-19 15:00:50 +01:00
Laurent Destailleur
ac9ab7b228 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-19 14:10:17 +01:00
Laurent Destailleur
8889e7f4b2 FIX translation of holiday types 2018-03-19 14:09:44 +01:00
Laurent Destailleur
7272ee806e Fix field not mandatory 2018-03-19 12:55:13 +01:00
Laurent Destailleur
ae17ce6f9a NEW Add a tab to specify accountant/auditor of the company 2018-03-19 12:52:09 +01:00
Laurent Destailleur
91b3ffc3da
Merge pull request #8409 from aspangaro/8.0-a10 
NEW Add a tab to specify accountant/auditor of the company
 2018-03-19 12:40:44 +01:00
Laurent Destailleur
13801a0d93
Merge pull request #8417 from hregis/7.0_bug3 
Fix: replace ldaps:// by ssl://
 2018-03-19 12:38:14 +01:00
Laurent Destailleur
eb7886ecff
Update ldap.class.php 2018-03-19 12:37:53 +01:00
Laurent Destailleur
1837d6a5f3 Better look of lines 2018-03-19 12:30:48 +01:00
Laurent Destailleur
76a7cc0d5c
Merge pull request #8299 from aspangaro/8.0-a7 
NEW On invoice card, show accounting account linked
 2018-03-19 12:19:46 +01:00
Laurent Destailleur
12068f9cf3
Merge branch 'develop' into 8.0-a7 2018-03-19 12:18:18 +01:00
Laurent Destailleur
2ae1bb26c5
Update compta.lang 2018-03-19 12:14:43 +01:00
Laurent Destailleur
c3cd2ff3db
Update objectline_view.tpl.php 2018-03-19 12:13:18 +01:00
Regis Houssin
890d0b6685 Fix: replace ldaps:// by ssl:// 2018-03-19 12:11:59 +01:00
Laurent Destailleur
6f7098d22e
Update objectline_view.tpl.php 2018-03-19 12:09:38 +01:00
Laurent Destailleur
928d428956
Merge pull request #8412 from atm-florian/dev_scrunit 
fix scrutinizer
 2018-03-19 12:08:14 +01:00
Laurent Destailleur
5a98958280
Update adherent.class.php 2018-03-19 12:07:08 +01:00
Laurent Destailleur
ce3975377d Link to unlink is unlink and not remove 2018-03-19 12:02:49 +01:00
Laurent Destailleur
e91ffa00eb NEW Can crop image files attached in "document" tabs of a member 2018-03-19 11:56:04 +01:00
Laurent Destailleur
f46df6d8e5 Can resize and crop images in the ticketsup module 2018-03-19 11:49:05 +01:00
Laurent Destailleur
f8ca4b1b5c NEW Add option BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD 2018-03-19 11:34:48 +01:00
Laurent Destailleur
0013e9d83b FIX Make a redirect after the remove_file action to avoid deletion done 
at next action too.
 2018-03-19 11:29:36 +01:00
Laurent Destailleur
5db718448f Delete at end 2018-03-19 11:29:06 +01:00
Laurent Destailleur
8899b511fd FIX Make a redirect after the remove_file action to avoid deletion done 
at next action too.
 2018-03-19 11:28:55 +01:00
Laurent Destailleur
6ca40bcbd4 Fix translation 2018-03-19 11:01:44 +01:00
Laurent Destailleur
9aa4a90543 NEW Stripe online payments reuse the same stripe customer account 2018-03-19 10:57:19 +01:00
Laurent Destailleur
8e72ddc89b FIX missing email of customer in stripe info payments 2018-03-19 10:18:03 +01:00