bobby
|
b95e9f0097
|
NEW : Add expense report into accountancy report
|
2016-01-28 14:26:52 +01:00 |
|
bobby
|
9c7572f2db
|
Fix Travis
|
2016-01-28 14:03:44 +01:00 |
|
bobby
|
72e8680f7c
|
FIX : set column paid on expense report when expense is paid
|
2016-01-28 13:57:40 +01:00 |
|
bobby
|
87284ef9be
|
accoutancy module enhancement
|
2016-01-28 13:37:09 +01:00 |
|
bobby
|
6aa6c067fb
|
fix travis
|
2016-01-28 13:24:38 +01:00 |
|
bobby
|
618a7c5acf
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2016-01-28 13:13:18 +01:00 |
|
bobby
|
283412f489
|
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9
|
2016-01-28 13:12:57 +01:00 |
|
Laurent Destailleur
|
cd58c93de6
|
FIX If option to hide automatic ECM is on, dont show menu.
|
2016-01-28 12:51:34 +01:00 |
|
Laurent Destailleur
|
2141a2f8a1
|
Fix css
|
2016-01-28 12:44:04 +01:00 |
|
phf
|
6eecf2f29a
|
FIX filter by socid if from customer card
|
2016-01-28 12:30:49 +01:00 |
|
Laurent Destailleur
|
83e8efa910
|
Fix picto private project was same than public project
|
2016-01-28 12:19:19 +01:00 |
|
Laurent Destailleur
|
99b2236260
|
FIX Selection of project must no show closed project
|
2016-01-28 12:19:13 +01:00 |
|
Laurent Destailleur
|
c09fa6e0dd
|
Fix empty keys are not allowed into select
|
2016-01-28 12:19:06 +01:00 |
|
Laurent Destailleur
|
c8d232e056
|
Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
htdocs/contrat/card.php
|
2016-01-28 12:18:25 +01:00 |
|
Laurent Destailleur
|
7aecc5ed95
|
Fix picto private project was same than public project
|
2016-01-28 12:12:16 +01:00 |
|
Laurent Destailleur
|
df4cd3de17
|
FIX Selection of project must no show closed project
|
2016-01-28 12:05:14 +01:00 |
|
Regis Houssin
|
8a80e06580
|
Fix: missing field "label"
|
2016-01-28 11:42:00 +01:00 |
|
Laurent Destailleur
|
cf6c06f9e7
|
Reduce lost space into ckeditor margins
|
2016-01-28 04:47:31 +01:00 |
|
Frédéric FRANCE
|
f341c7fedd
|
Avoid errors with bad parameters
|
2016-01-27 23:09:05 +01:00 |
|
Laurent Destailleur
|
06bbf4c966
|
Fix empty keys are not allowed into select
|
2016-01-27 21:10:42 +01:00 |
|
Laurent Destailleur
|
20e110a882
|
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
|
2016-01-27 18:48:06 +01:00 |
|
Laurent Destailleur
|
45656c18e8
|
Fix hover css
|
2016-01-27 18:47:52 +01:00 |
|
fmarcet
|
e3d8a9a8a4
|
FIX: Doesn't collect the value of the cost price correctly
|
2016-01-27 12:13:31 +01:00 |
|
Christophe Battarel
|
1baf25de3c
|
FIX ISSUE #4506 : make working the PROPAL_CLONE_ON_CREATE_PAGE hidden
constant
|
2016-01-27 12:04:00 +01:00 |
|
fmarcet
|
eec8d30625
|
FIX: Not returning the correct multilevel price
|
2016-01-27 10:57:04 +01:00 |
|
phf
|
4baff7898d
|
FIX insert FactureLigne
FIX phpunit PriceTest with new values returned for multicurrency module
NEW add test in PriceTest
FIX FactureTest properties not defined
|
2016-01-26 22:18:31 +01:00 |
|
Laurent Destailleur
|
fccecc902d
|
Merge branch '3.8' of github.com:Dolibarr/dolibarr into 3.8
|
2016-01-26 18:30:08 +01:00 |
|
Laurent Destailleur
|
e0683681ff
|
Merge
|
2016-01-26 18:28:47 +01:00 |
|
Laurent Destailleur
|
5fd6057c6c
|
FIX Deadlock situation. Can't edit anymore contract.
FIX List of automatic events was not visible.
|
2016-01-26 18:22:37 +01:00 |
|
Maxime Kohlhaas
|
6313f64c93
|
Fix : amount in bank line is necessarily in the account currency
|
2016-01-26 18:09:52 +01:00 |
|
Laurent Destailleur
|
25924f31ad
|
Bad translation
|
2016-01-26 17:57:57 +01:00 |
|
Laurent Destailleur
|
33355c613a
|
FIX When we make a direct assignement on a task to a user, we must check
he is also assigned to project (and if not assign it)
|
2016-01-26 17:50:57 +01:00 |
|
fmarcet
|
c2efee8a29
|
FIX: Contrat card don't consider user permissions to show active/unactive service button
|
2016-01-26 13:02:21 +01:00 |
|
phf
|
83f90e2b1f
|
Merge branch 'new_multicurrency_module' of github.com:atm-ph/dolibarr into new_multicurrency_module
Conflicts:
htdocs/commande/card.php
|
2016-01-25 21:50:43 +01:00 |
|
phf
|
b2b787f1ff
|
FIX Travis
|
2016-01-25 21:33:14 +01:00 |
|
phf
|
8e933ebb2d
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_multicurrency_module
|
2016-01-25 19:31:35 +01:00 |
|
Laurent Destailleur
|
d33548e32c
|
Fix in md theme
|
2016-01-25 17:31:40 +01:00 |
|
Laurent Destailleur
|
ce02f05d43
|
Translation of dashboard
|
2016-01-25 17:18:17 +01:00 |
|
Laurent Destailleur
|
8d41cc3660
|
Merge remote-tracking branch 'origin/3.9' into develop
|
2016-01-25 16:02:15 +01:00 |
|
Laurent Destailleur
|
93903b7330
|
Task lit to assign when entering timesheet is on top. This is more
convenient and save spaces.
|
2016-01-25 16:01:50 +01:00 |
|
Laurent Destailleur
|
0f70ccad50
|
Merge remote-tracking branch 'origin/3.8' into 3.9
|
2016-01-25 15:39:16 +01:00 |
|
Laurent Destailleur
|
b690a2a860
|
Merge remote-tracking branch 'origin/3.7' into 3.8
|
2016-01-25 15:38:49 +01:00 |
|
Laurent Destailleur
|
feb114625d
|
Merge remote-tracking branch 'origin/3.6' into 3.7
|
2016-01-25 15:37:55 +01:00 |
|
Laurent Destailleur
|
c1b6630c16
|
Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
htdocs/main.inc.php
|
2016-01-25 15:37:04 +01:00 |
|
Raphaël Doursenaud
|
ed16699de6
|
FIX #4291 Correctly filter external calendar GETPOSTs
|
2016-01-25 15:32:08 +01:00 |
|
Laurent Destailleur
|
0814fa76f8
|
FIX CVE CVE-2015-8685
|
2016-01-25 15:26:52 +01:00 |
|
Laurent Destailleur
|
667651860d
|
Fix sql injection #4341
|
2016-01-25 15:24:31 +01:00 |
|
Frédéric FRANCE
|
9909918078
|
Text not initialized
|
2016-01-25 13:52:35 +01:00 |
|
Laurent Destailleur
|
274caf61eb
|
NEW Add statistics for interventions module
|
2016-01-25 13:34:05 +01:00 |
|
bobby
|
71c407e670
|
add coala book keeping export
|
2016-01-25 12:43:47 +01:00 |
|