aspangaro
|
e5808f876d
|
Merge remote-tracking branch 'Upstream/3.9' into 3.9-p6
|
2016-01-24 07:04:20 +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
|
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
|
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 |
|
Laurent Destailleur
|
2b96c8f205
|
FIX Noway to validate a leave request for some uer even if they have
permission for.
|
2016-01-23 11:05:06 +01:00 |
|
Laurent Destailleur
|
1012fb8be1
|
Update demo data
|
2016-01-22 19:11:46 +01:00 |
|
Laurent Destailleur
|
b09d3663d6
|
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
|
2016-01-22 18:10:35 +01:00 |
|
Laurent Destailleur
|
4c3f9db2a1
|
Add demo data
|
2016-01-22 18:10:19 +01:00 |
|
Laurent Destailleur
|
fac38db2bf
|
Merge pull request #4457 from atm-arnaud/3.8_fix_bookmarks_user_update
FIX bookmark's user change after update if the user isn't superadmin
|
2016-01-22 16:42:59 +01:00 |
|
Laurent Destailleur
|
540bb04cac
|
Update demo init data
|
2016-01-22 14:29:44 +01:00 |
|
Laurent Destailleur
|
dadc24462a
|
Fix: We must ue the "small" size of imge to show on card pages.
|
2016-01-22 14:14:39 +01:00 |
|
Laurent Destailleur
|
49a325e7ae
|
Fix: We must ue the "small" size of imge to show on card pages.
|
2016-01-22 14:10:27 +01:00 |
|
Laurent Destailleur
|
fedf1f3288
|
Fix view of product image when using old path
Fix size of image uploaded on user.
|
2016-01-22 14:02:48 +01:00 |
|
Laurent Destailleur
|
50b0019ead
|
A protection to avoid situation loosing all admin accounts
|
2016-01-22 11:54:14 +01:00 |
|
Laurent Destailleur
|
f2f4c60dbd
|
Merge pull request #4469 from aspangaro/3.9-p8
Fix: Commercial index presentation - missing $var=!$var when we have no data
|
2016-01-22 04:15:22 +01:00 |
|
Laurent Destailleur
|
a406334643
|
Merge pull request #4458 from atm-alexis/FIX_bad_pdf_refetch_erase_hook_modification
FIX line refetch incompatible with hook practice
|
2016-01-22 04:10:06 +01:00 |
|
Laurent Destailleur
|
9fd56df03f
|
Merge pull request #4444 from marcosgdf/bug-4440-2
FIX #4440 Wrong price is filled by Product::fetch into multiprices arrays
|
2016-01-22 03:47:22 +01:00 |
|
Laurent Destailleur
|
9d63cb0156
|
Merge pull request #4452 from hregis/3.7_bug
Fix: $outputlangs is not defined (dolibarr 3.7, 3.8, 3.9)
|
2016-01-22 03:45:35 +01:00 |
|
Laurent Destailleur
|
cceeefb7c2
|
Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
htdocs/societe/index.php
|
2016-01-22 03:25:30 +01:00 |
|
Laurent Destailleur
|
cbd01bae49
|
Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
htdocs/admin/dict.php
htdocs/core/tpl/objectline_edit.tpl.php
htdocs/societe/index.php
|
2016-01-22 03:18:51 +01:00 |
|
Laurent Destailleur
|
d857b3475b
|
Fix doxygen
|
2016-01-22 03:07:46 +01:00 |
|
Laurent Destailleur
|
56a4466b5b
|
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
|
2016-01-22 03:04:22 +01:00 |
|
Laurent Destailleur
|
34c648b351
|
FIX #4418
|
2016-01-22 03:04:07 +01:00 |
|
Laurent Destailleur
|
cd71d53ffd
|
Merge pull request #4422 from marcosgdf/patch-2
Corrected wrong translation
|
2016-01-22 02:11:46 +01:00 |
|
Laurent Destailleur
|
219ce73ea2
|
Merge pull request #4417 from atm-arnaud/3.8_fix_factures_nblignes_after_hook
FIX nblignes not calculated after hook and hook can't modify this val...
|
2016-01-22 02:10:36 +01:00 |
|
Laurent Destailleur
|
4e87afddf1
|
Fix: why a floating float here ?
|
2016-01-21 22:44:05 +01:00 |
|
Laurent Destailleur
|
b5c047d9a5
|
Fix link on project ref on task list must jump to tab task
|
2016-01-21 15:15:26 +01:00 |
|
Laurent Destailleur
|
39aede4071
|
Fix bad list of project/tasks
|
2016-01-21 15:09:46 +01:00 |
|
Laurent Destailleur
|
dd6e60630d
|
Fix size of cells make page too large even for large screen
|
2016-01-21 15:01:53 +01:00 |
|
Laurent Destailleur
|
3c68ac55b9
|
Fix missing loading lang
|
2016-01-21 15:00:39 +01:00 |
|
aspangaro
|
8a36bda3d2
|
Merge remote-tracking branch 'Upstream/3.9' into 3.9-p8
|
2016-01-21 05:46:11 +01:00 |
|
aspangaro
|
192c58f10d
|
Fix: Commercial index presentation - missing $var=!$var when we have no data
|
2016-01-21 05:44:53 +01:00 |
|
Alexis Algoud
|
48d674578b
|
FIX line is refetch (and seems useless) unless it was modified by the hook previous calling
|
2016-01-19 11:54:07 +01:00 |
|
arnaud
|
9ce6e2938c
|
FIX bookmark's user change after update if the user hasn't superadmin right
|
2016-01-19 09:46:27 +01:00 |
|
Laurent Destailleur
|
6eb6b0315f
|
Fix bad field used for search on start date
|
2016-01-18 16:47:14 +01:00 |
|
Laurent Destailleur
|
17ceca3758
|
Fix: no create button on list
|
2016-01-18 16:44:04 +01:00 |
|
Laurent Destailleur
|
2386b79dfc
|
FIX Option to disable meteo was not set correctly in edit mode
|
2016-01-18 14:49:15 +01:00 |
|
Regis Houssin
|
535d3bc087
|
Merge remote-tracking branch 'origin/3.7' into 3.7_bug
|
2016-01-18 13:04:08 +01:00 |
|
Marcos García de La Fuente
|
da637db162
|
FIX #4440 Wrong price is filled by Product::fetch into multiprices arrays
|
2016-01-18 10:17:59 +01:00 |
|
Laurent Destailleur
|
4d2b5d71af
|
Fix missing translation key
|
2016-01-17 17:35:02 +01:00 |
|
Laurent Destailleur
|
af4d57b461
|
Complete demo samples
|
2016-01-16 17:41:17 +01:00 |
|