Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
78,589 Commits 36 Branches 189 Tags
594d9e321e8c7753932ca8ee98491036a3b51ec9
Commit Graph

842 Commits

Author SHA1 Message Date
Alexandre SPANGARO
3779b6ff1c Update work on assets type 2018-04-02 08:22:26 +02:00
Alexandre SPANGARO
3799713c04 Update works 2018-04-02 06:27:55 +02:00
Alexandre SPANGARO
a5428cc8c7 NEW Module Assets 2018-04-01 21:26:52 +02:00
Regis Houssin
20e80a58a8 Fix: limit access to internal users 2018-04-01 11:43:39 +02:00
Laurent Destailleur
224fa1c03e Fix external links ko when substitution key are inside domain 2018-03-24 12:48:33 +01:00
Laurent Destailleur
ab9edef3c7 Fix external links ko when substitution key are inside domain 2018-03-24 12:46:52 +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
76cceb59a9 Nead perm to read all for monthly report of leave requests 2018-03-20 13:54:52 +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
8cf2d4eb45 Fix filter on holiday statut 
Fix tr/td balance for extrafields on lines
 2018-03-20 10:10:21 +01:00
Laurent Destailleur
c9566e9501 Merge pull request #8392 from aspangaro/8.0-a9 
NEW Add stats in salaries module
 2018-03-15 14:28:35 +01:00
Laurent Destailleur
d804764134 Standardize look and feel 2018-03-15 10:41:43 +01:00
Alexandre SPANGARO
5eccc6bcbc NEW Add stats in salaries module 2018-03-15 06:23:20 +01:00
Laurent Destailleur
64f21b8a3c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expensereport/card.php
 2018-03-11 00:10:13 +01:00
Laurent Destailleur
75b470b580 Update eldy.lib.php 2018-03-10 12:43:01 +01:00
Laurent Destailleur
04bcc4dd46 Update eldy.lib.php 2018-03-10 12:39:39 +01:00
florian HENRY
1c966d4769 on going 2018-03-09 12:57:58 +01:00
Laurent Destailleur
864edce665 NEW Accept anonmymous events (no user assigned) 
NEW Online payment now record the payment on invoices
 2018-03-04 19:39:46 +01:00
Laurent Destailleur
2fc97e5c8c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-12 14:01:34 +01:00
Laurent Destailleur
734bd4d2fb Fix menu visible in dev only 2018-02-12 10:15:58 +01:00
Laurent Destailleur
eb8664e649 NEW Can export leave requests 2018-02-09 16:08:28 +01:00
Laurent Destailleur
eccdc9a075 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/langs/pt_PT/companies.lang
 2018-02-08 15:20:24 +01:00
Laurent Destailleur
b95cd2f383 Fix translation 2018-02-06 19:33:31 +01:00
Laurent Destailleur
69196dc52c Fix menu not visible with auguria module 2018-02-06 18:22:04 +01:00
Laurent Destailleur
22b95b1c43 Simpler top menu code 2018-02-05 23:06:48 +01:00
Laurent Destailleur
85964e02de Fix css 2018-02-05 12:34:11 +01:00
Laurent Destailleur
10e7517596 Fix missing mainmenu and leftmenu into menu definition 2018-02-05 02:29:19 +01:00
Laurent Destailleur
c02d46fb0a Fix leftmenu in menu entries 2018-02-05 01:33:44 +01:00
Laurent Destailleur
7a1a2cf90d Fix send into ledger for bank line record. Show accounted status. 2018-01-22 04:13:29 +01:00
Laurent Destailleur
49f59e0d06 Fix menu visible in experimental mode 2018-01-10 11:02:11 +01:00
Laurent Destailleur
e640831653 Merge pull request #7553 from atm-maxime/new_menu_expense_holidays 
Add detailed menus in HRM module
 2017-12-10 21:15:51 +01:00
Laurent Destailleur
e3dcff7f5b Fix substition for menus title and urls 2017-12-09 15:35:01 +01:00
Maxime Kohlhaas
6b278a6740 Add icons on home page menu 2017-12-07 16:01:52 +01:00
Maxime Kohlhaas
3fb8ec5067 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_menu_expense_holidays 2017-12-06 23:52:02 +01:00
Laurent Destailleur
46b281f703 Fix for #7697 2017-12-01 19:29:29 +01:00
Laurent Destailleur
a0231b5c60 Fix responsive 2017-12-01 12:55:28 +01:00
Laurent Destailleur
501f5b8292 Merge duplicate translation key 2017-11-14 18:26:39 +01:00
Laurent Destailleur
a50589c3c9 NEW Better behaviour when using a text browser 2017-11-14 15:10:46 +01:00
Laurent Destailleur
a98452ae36 Move translation 2017-11-01 10:52:42 +01:00
Laurent Destailleur
d569218162 Fix 'separate' extrafields must be visible by default. 
Sandardize name of list pages (must end with _list.php)
 2017-10-29 11:23:20 +01:00
Laurent Destailleur
9dc4933ba0 Debug 2017-10-24 15:32:01 +02:00
Laurent Destailleur
5fd6a27c62 Fix position of top menu 2017-10-12 02:16:54 +02:00
Laurent Destailleur
a501a20487 NEW Search filters in lists are restored when using "back to list" 2017-10-03 16:00:52 +02:00
Maxime Kohlhaas
a88bcb5299 Add detailed menus in HRM module 2017-10-03 13:49:30 +02:00
Laurent Destailleur
839f3ca41d NEW Can use an url like $conf->global>-MYPARAM for menu urls 2017-09-23 03:22:48 +02:00
Laurent Destailleur
bd45ea5a03 Split page for invoice template into card + list. Add more filters. 2017-09-22 11:28:53 +02:00
Laurent Destailleur
ffe2ee8232 Standardize code 2017-09-19 19:00:28 +02:00
Laurent Destailleur
85d59b32b3 Add timespent entry into HR top menu too 
Faster update of total of timespent
 2017-09-18 13:15:24 +02:00
Laurent Destailleur
0355b0d9ed Merge pull request #7414 from aspangaro/7.0-4 
Accountancy - Finish moving admin to specific menu & some cleaning
 2017-09-18 11:16:36 +02:00
Laurent Destailleur
ad40d27324 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_sendmails.inc.php
 2017-09-16 12:22:18 +02:00