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

65723 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
7b6104de38
Merge pull request #8427 from ATM-Consulting/develop_atm 
NEW: method Form::selectArrayFilter() + use in left menu search
 2018-03-21 20:44:44 +01:00
Laurent Destailleur
0cba7fc761
Update main.inc.php 2018-03-21 20:44:32 +01:00
Laurent Destailleur
a54316ef05
Update main.inc.php 2018-03-21 20:43:26 +01:00
Laurent Destailleur
49f7c64f5e
Merge pull request #8422 from dolibarr95/patch-41 
NEW Add dol_print_phone in thirdparty list page
 2018-03-21 20:40:59 +01:00
Laurent Destailleur
10d7e7d289
Merge pull request #8425 from atm-florian/dev_scrunit 
Dev scrunit
 2018-03-21 20:40:01 +01:00
Laurent Destailleur
423bd56646
Merge pull request #8423 from grandoc/new_branch_20_03_2018 
New [*use loadLangs for translation files*]
 2018-03-21 20:39:40 +01:00
Laurent Destailleur
5556986001 Trad 2018-03-21 20:15:21 +01:00
Laurent Destailleur
35938b1942 NEW Variable __ONLINE_PAYMENT_URL__ available in email templates 2018-03-21 20:06:22 +01:00
Laurent Destailleur
517301f014 Work on subscription reminder 2018-03-21 16:40:09 +01:00
Marc de Lima Lucio
08fcd67e0f FIX: travis 2018-03-21 16:23:28 +01:00
Marc de Lima Lucio
744c263c6c NEW: selectArrayFilter() + use in left menu search 2018-03-21 15:08:20 +01:00
Laurent Destailleur
200fd88132 Fix output message in log rotation job 2018-03-21 13:56:24 +01:00
Laurent Destailleur
7e5c3cc807 Code comment 2018-03-21 13:30:30 +01:00
Laurent Destailleur
42b0a22df2 Use font-awsome for play icon 2018-03-21 13:16:05 +01:00
Laurent Destailleur
ff0ad94035 Stripe customer info are linked to thirdparty too on payment for member 
module.
 2018-03-21 11:45:35 +01:00
Laurent Destailleur
e51eb4ae1c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-21 11:00:28 +01:00
Laurent Destailleur
891ebc0e7c Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-21 10:59:59 +01:00
Laurent Destailleur
04199c2b4b Fix according to mail of Olivier Geffroy the 21th of march 2018-03-21 10:59:13 +01:00
Laurent Destailleur
857bb6c6ee Css 2018-03-21 10:53:15 +01:00
dolibarr95
4b0eede1dd
Delete getCountry() and select field in sql query 
Delete getCountry() and select field in sql query
 2018-03-21 08:53:38 +01:00
florian HENRY
d959905e4f fix scrutinizer 2018-03-21 08:35:03 +01:00
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
fc50fcd59e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-20 20:07:24 +01:00
Laurent Destailleur
ac35acb273 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-20 20:04:20 +01:00
Laurent Destailleur
fe53ff56ee FIX Error management in leave request 2018-03-20 20:03:44 +01:00
Philippe GRAND
0d7ffefc8f New [*use loadLangs for translation files*] 2018-03-20 19:47:25 +01:00
Laurent Destailleur
11d33c8dcc
Merge pull request #8420 from hregis/7.0_bug3 
Fix: better compatibility with all hostname syntax
 2018-03-20 17:32:14 +01:00
Laurent Destailleur
a3a416aa7a Can remove comment added due to lack of test 2018-03-20 16:46:09 +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
dolibarr95
9887d38589
Add dol_print_phone 
Add dol_print_phone in thirdparty table list.
 2018-03-20 11:13:02 +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
Regis Houssin
4767819b7a Fix: better compatibility with all hostname syntax 2018-03-19 17:59:23 +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