Commit Graph

55397 Commits

Author SHA1 Message Date
Laurent Destailleur
aba8304086 Fix code not reachable 2016-08-31 19:44:45 +02:00
Laurent Destailleur
545bc9d33d Fix var conf not defined. 2016-08-31 19:36:21 +02:00
Laurent Destailleur
8fd082cf16 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/hrm/hrm.php
2016-08-31 16:16:19 +02:00
Laurent Destailleur
45fceaeea5 Fix another field not responsive 2016-08-31 16:14:31 +02:00
Laurent Destailleur
c4ae712bac Fix responsive design 2016-08-31 16:09:56 +02:00
Laurent Destailleur
e62299d67e NEW Add date into list of print jobs for Google Print. 2016-08-31 14:36:08 +02:00
Laurent Destailleur
3edb04c5b8 Fix missing migration to create entity 2016-08-31 12:54:44 +02:00
Laurent Destailleur
c49508c415 Revert "Fix migration for entity in remise table"
This reverts commit 452f7be441.
2016-08-31 12:52:25 +02:00
Laurent Destailleur
95c2133b07 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-08-31 12:39:17 +02:00
Laurent Destailleur
8cfac3b5c3 FIX Several problems when using smartphone 2016-08-31 12:38:54 +02:00
Juanjo Menent
90c670a89e Merge pull request #5684 from aspangaro/5.0-p9
Uniformize presentation on suppliers invoices
2016-08-31 10:08:57 +02:00
Juanjo Menent
966c1f61a3 Merge pull request #5682 from aspangaro/5.0-p8
Fix: Uniformize presentation of customer's invoice
2016-08-31 10:06:09 +02:00
Juanjo Menent
8fb70bd0ef Merge pull request #5681 from simnandez/4.0
Fix #5641 Dolibarr 4.0 RC2 bug when create new contract
2016-08-31 10:04:39 +02:00
aspangaro
688ac691a9 Uniformize presentation on suppliers invoices 2016-08-31 07:05:23 +02:00
aspangaro
3892f295c7 Uniformize presentation of customer's invoice 2016-08-31 06:27:35 +02:00
Juanjo Menent
bc09fb1154 Merge remote-tracking branch 'upstream/4.0' into 4.0 2016-08-31 02:50:16 +02:00
Juanjo Menent
9e6429320a Fix #5641 Dolibarr 4.0 RC2 bug when create new contract 2016-08-31 02:47:42 +02:00
Juanjo Menent
a0591ac520 Merge pull request #5678 from atm-maxime/develop
Fix migration for entity in remise table
2016-08-31 02:15:46 +02:00
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
ea6daeebbb Merge pull request #5675 from aspangaro/4.0-p46
Fix: VAT Area - Problem of presentation
2016-08-31 02:12:19 +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
Maxime Kohlhaas
452f7be441 Fix migration for entity in remise table 2016-08-30 14:44:35 +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
aspangaro
b85e9938e8 Fix: VATArea - Problem of presentation 2016-08-30 05:17:27 +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