Commit Graph

55376 Commits

Author SHA1 Message Date
Juanjo Menent
3deadb1550 Merge pull request #5676 from aspangaro/5.0-p6
Fix: Presentation of Expense Report
2016-08-31 02:13:01 +02:00
Juanjo Menent
1f67b025d7 Merge pull request #5672 from aspangaro/5.0-p4
Fix: Missing language key
2016-08-31 02:09:55 +02:00
Juanjo Menent
612db4f66d Merge pull request #5673 from aspangaro/5.0-p5
Fix: Presentation on member card
2016-08-31 02:09:28 +02:00
Juanjo Menent
8155c09d49 Merge pull request #5671 from aspangaro/5.0-p3
Fix: Presentation on financial account
2016-08-31 02:08:33 +02:00
Juanjo Menent
eb23c8880d Merge pull request #5670 from aspangaro/5.0-p1
Fix: Presentation on salaries payment index
2016-08-31 02:07:11 +02:00
Juanjo Menent
bb71e818dc Merge pull request #5667 from aspangaro/5.0-p2
Remove the old file of ventilation module - Replace by advanced accou…
2016-08-31 02:06:28 +02:00
Laurent Destailleur
8352f64474 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/projet/tasks/time.php
2016-08-31 01:04:33 +02:00
Laurent Destailleur
524dd79198 Merge remote-tracking branch 'origin/4.0' into develop
Conflicts:
	htdocs/compta/bank/search.php
	htdocs/core/class/html.form.class.php
	htdocs/filefunc.inc.php
	htdocs/projet/tasks/time.php
2016-08-31 00:16:07 +02:00
Laurent Destailleur
c2b503d90f Fix missing filter 2016-08-31 00:15:09 +02:00
Laurent Destailleur
1be3c86b4b NEW Use new archi to select field into list of time spent 2016-08-30 20:17:34 +02:00
Laurent Destailleur
42293089a0 Fix several fix into tab management of tasks 2016-08-30 20:16:58 +02:00
Laurent Destailleur
124df446d7 Fix remove log 2016-08-30 18:12:26 +02:00
Laurent Destailleur
6dd11d78e8 NEW Better responsive design for very small device 2016-08-30 18:10:53 +02:00
Laurent Destailleur
cb660cba86 NEW More filter on bank transaction list 2016-08-30 18:10:30 +02:00
Laurent Destailleur
b06cc18568 Fix sort on amount 2016-08-30 11:53:42 +02:00
aspangaro
0467a5480d Presentation of Expense Report 2016-08-30 07:02:44 +02:00
Laurent Destailleur
216f7dbaee Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-08-30 00:21:56 +02:00
Laurent Destailleur
d7007bd16b Fix lang not loaded 2016-08-30 00:21:26 +02:00
aspangaro
e2a92f304d Presentation on member card 2016-08-29 22:07:21 +02:00
aspangaro
cfcd9677f1 Fix: Missing language key 2016-08-29 21:54:52 +02:00
aspangaro
358bcee3a5 Presentation on financiel account 2016-08-29 21:49:34 +02:00
Laurent Destailleur
d6d474f10d Clean code for category management. 2016-08-29 21:31:27 +02:00
aspangaro
31a895dddc Merge remote-tracking branch 'Upstream/develop' into 5.0-p1 2016-08-29 21:21:10 +02:00
aspangaro
5eb0e4ad87 Fix: Presentation on salaries payment index 2016-08-29 21:14:11 +02:00
Laurent Destailleur
98eb3fec5a Fix avoid migration when already migrated 2016-08-29 21:07:36 +02:00
Laurent Destailleur
ff0b424f74 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-08-29 18:18:35 +02:00
Laurent Destailleur
6b7d509e44 Fix css 2016-08-29 18:12:53 +02:00
Laurent Destailleur
fbdbad0d7c More space on dropdown 2016-08-29 18:04:21 +02:00
Laurent Destailleur
99246ecfba Fix css 2016-08-29 17:58:55 +02:00
Laurent Destailleur
d75804afe4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-08-29 17:50:41 +02:00
Laurent Destailleur
867525cc91 Fix missing migration instructions 2016-08-29 17:50:31 +02:00
Laurent Destailleur
b43bd371fd Merge pull request #5666 from aspangaro/4.0-p45
Fix: Wrong language key
2016-08-29 17:47:49 +02:00
Laurent Destailleur
aca54a1ca2 Merge pull request #5664 from grandoc/develop
fix : bad name
2016-08-29 17:45:38 +02:00
Laurent Destailleur
13f61f2a63 Fix css 2016-08-29 17:36:18 +02:00
Laurent Destailleur
c49c23df3d Fix debug project categories 2016-08-29 17:30:54 +02:00
Laurent Destailleur
64351f3428 Merge pull request #5668 from atm-florian/dev_catgeory_project_issue2701
Dev catgeory project issue 2701
2016-08-29 17:14:56 +02:00
Laurent Destailleur
9c1ba67169 Fix css 2016-08-29 16:40:51 +02:00
Laurent Destailleur
cd1a12c686 NEW Can edit a label for each price segment when using several segment
prices for products.
2016-08-29 16:30:31 +02:00
Laurent Destailleur
8b959a09f2 Fix missing /form 2016-08-29 16:12:56 +02:00
Laurent Destailleur
2ba920a4cb Fix for jmobile 2016-08-29 11:33:48 +02:00
florian HENRY
90466f37a7 travis comment 2016-08-29 11:10:30 +02:00
florian HENRY
56f0ffee0b add category entry menu into auguria menu sql 2016-08-29 10:47:13 +02:00
florian HENRY
cd1f78cd52 continur working 2016-08-29 10:41:14 +02:00
florian HENRY
a4ce756724 Manage project category 2016-08-29 10:32:00 +02:00
aspangaro
14e6e705c3 Remove the old file of ventilation module - Replace by advanced accountancy module 2016-08-29 07:44:09 +02:00
aspangaro
7cb4f85f6b Fix: Wrong language key 2016-08-29 07:30:39 +02:00
Laurent Destailleur
af070dad94 Fix sort of fields 2016-08-28 23:53:13 +02:00
Laurent Destailleur
f7c89b0044 Update doc 2016-08-28 23:52:40 +02:00
Laurent Destailleur
b8201c9f86 Fix fk_soc can be null because we can set notification for users only. 2016-08-28 23:46:12 +02:00
Laurent Destailleur
385aca8bf2 Fix sort of list and number of records 2016-08-28 23:25:24 +02:00