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 |
|
bobby
|
59f356905a
|
Accoutancy update
|
2016-01-25 12:42:18 +01:00 |
|
bobby
|
c286c4c6ec
|
Accoutancy update
|
2016-01-25 12:39:21 +01:00 |
|
Laurent Destailleur
|
467dc12a7b
|
NEW Module "Supplier commercial proposal" (price request) is set to
stable status.
|
2016-01-25 12:33:38 +01:00 |
|
Laurent Destailleur
|
d65229998b
|
Work on website module
|
2016-01-25 10:25:52 +01:00 |
|
Laurent Destailleur
|
ba833dc412
|
Work on CMS module
|
2016-01-24 21:35:41 +01:00 |
|
Laurent Destailleur
|
8d46a56dac
|
Work on CMS module
|
2016-01-24 21:17:11 +01:00 |
|
Laurent Destailleur
|
7c96194750
|
NEW Hidden option MAIN_LANDING_PAGE to choose the first page to show
after login works as a "global" option (llx_const) and as a "per user"
option (llx_user_param).
|
2016-01-24 17:40:07 +01:00 |
|
Laurent Destailleur
|
c1ebdd3b4f
|
Default url is home
|
2016-01-24 11:35:33 +01:00 |
|
aspangaro
|
73d5e7036f
|
Refactoring eldy menu to test
|
2016-01-24 08:21:18 +01:00 |
|
aspangaro
|
e5808f876d
|
Merge remote-tracking branch 'Upstream/3.9' into 3.9-p6
|
2016-01-24 07:04:20 +01:00 |
|
phf
|
963d0c396b
|
FIX change rate on order/invoice do not update lines
NEW if we change the currency on already existing propal/order/invoice the
current rate is update too then update lines
|
2016-01-23 21:36:07 +01:00 |
|
Marcos García de La Fuente
|
83263e242e
|
Corrected typo of PR #4444
|
2016-01-23 20:32:22 +01:00 |
|
bobby
|
50d2665b0e
|
Fix travis
|
2016-01-23 19:42:40 +01:00 |
|
bobby
|
4dd56c52d2
|
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9
|
2016-01-23 19:39:33 +01:00 |
|
Laurent Destailleur
|
469a44a4cf
|
NEW Include number of linked files into badge counter of "Linked files"
tab.
|
2016-01-23 17:23:00 +01:00 |
|
Laurent Destailleur
|
da93e35dbb
|
NEW Include number of linked files into badge counter of "Linked files"
tab.
|
2016-01-23 17:19:34 +01:00 |
|
phf
|
9376699299
|
FIX travis missing comment for new param
|
2016-01-23 16:16:15 +01:00 |
|
phf
|
373225272b
|
FIX reorder the display of currency and rate on propal/order
FIX update line on propal/order
NEW add mulitcurrency on customer invoice
|
2016-01-23 16:01:55 +01:00 |
|
Laurent Destailleur
|
a435d0e147
|
Merge remote-tracking branch 'origin/3.9' into develop
|
2016-01-23 14:56:45 +01:00 |
|
Laurent Destailleur
|
5b0d06e48c
|
Merge remote-tracking branch 'origin/3.8' into 3.9
|
2016-01-23 14:56:16 +01:00 |
|
Laurent Destailleur
|
c0e5fdee0e
|
Update demo
|
2016-01-23 14:55:05 +01:00 |
|
Laurent Destailleur
|
097251ec7f
|
Merge remote-tracking branch 'origin/3.9' into develop
|
2016-01-23 12:29:22 +01:00 |
|
Laurent Destailleur
|
615ffe5417
|
Merge remote-tracking branch 'origin/3.8' into 3.9
|
2016-01-23 12:28:34 +01:00 |
|
Laurent Destailleur
|
200a6d3c3b
|
Update demo data
|
2016-01-23 12:27:49 +01:00 |
|
Laurent Destailleur
|
a841db1eeb
|
FIX Purge of temp files was broken
|
2016-01-23 12:24:46 +01:00 |
|
Laurent Destailleur
|
a3c273aec8
|
Update demo datas
|
2016-01-23 12:07:57 +01:00 |
|
Laurent Destailleur
|
f8cd4eb166
|
Update demo
|
2016-01-23 12:04:09 +01:00 |
|
Laurent Destailleur
|
4df584e57b
|
Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
htdocs/core/lib/files.lib.php
|
2016-01-23 11:51:56 +01:00 |
|
Laurent Destailleur
|
dbaa43f3be
|
Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
htdocs/fourn/commande/card.php
htdocs/holiday/card.php
htdocs/holiday/list.php
htdocs/user/card.php
|
2016-01-23 11:45:39 +01:00 |
|
Laurent Destailleur
|
dc438792f4
|
Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
htdocs/fourn/commande/card.php
|
2016-01-23 11:39:37 +01:00 |
|
Laurent Destailleur
|
9be246baa5
|
Merge remote-tracking branch 'origin/3.6' into 3.7
|
2016-01-23 11:32:06 +01:00 |
|
Laurent Destailleur
|
3903ced5b4
|
Fix: link to add at wrong place
|
2016-01-23 11:30:06 +01:00 |
|
Laurent Destailleur
|
627f606c4d
|
Fix list of leave request was not showing label correctly.
|
2016-01-23 11:17:20 +01:00 |
|