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 |
|
Laurent Destailleur
|
c0e5fdee0e
|
Update demo
|
2016-01-23 14:55:05 +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
|
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
|
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
|
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
|
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
|
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
|
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 |
|
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
|
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 |
|
Laurent Destailleur
|
be4f9baac6
|
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
|
2016-01-16 10:21:52 +01:00 |
|
Laurent Destailleur
|
d46c655fb4
|
FIX: Sql syntax error in doc_generic_task_odt
|
2016-01-16 10:20:14 +01:00 |
|
Regis Houssin
|
6e30d5e516
|
Merge remote-tracking branch 'origin/3.7' into 3.7_bug
|
2016-01-15 13:16:40 +01:00 |
|
Regis Houssin
|
6aeb18ed75
|
Revert "Fix: for avoid division by 0"
This reverts commit c71d578931.
|
2016-01-15 13:14:55 +01:00 |
|
Regis Houssin
|
905f9d78ed
|
Fix: $outputlangs is not defined (dolibarr 3.7, 3.8, 3.9)
|
2016-01-15 13:12:19 +01:00 |
|
arnaud
|
8b2541ebf9
|
FIX nblignes not calculated after hook and hook can't modify this value. Usefull for modules
|
2016-01-14 14:10:50 +01:00 |
|
Laurent Destailleur
|
d98415f9b5
|
Merge pull request #4413 from hregis/3.8_bug
Fix: ajax error with multicompany module
|
2016-01-14 11:08:16 +01:00 |
|
Regis Houssin
|
3a3ae90a0a
|
Fix: ajax error with multicompany module
|
2016-01-13 15:44:26 +01:00 |
|
Laurent Destailleur
|
004285c6b4
|
Merge pull request #4412 from atm-ph/fix_3.8_clone_event
FIX can't clone event
|
2016-01-13 15:10:36 +01:00 |
|
phf
|
9b682e095f
|
FIX can't clone event
|
2016-01-13 14:41:32 +01:00 |
|
Laurent Destailleur
|
947f718329
|
Merge pull request #4408 from fmarcet/3.7
FIX: The third dashboard don't consider user permissions
|
2016-01-12 23:23:49 +01:00 |
|
Laurent Destailleur
|
93ed7c098b
|
Merge pull request #4407 from atm-ph/fix_3.8_pdf_muscadet_use_hour
FIX pdf_muscadet delivery hour
|
2016-01-12 23:21:05 +01:00 |
|
Laurent Destailleur
|
1b1bd73e6b
|
Merge pull request #4404 from frederic34/patch-8
FIX When doing payment for money back, bank account was not set by default
|
2016-01-12 23:20:32 +01:00 |
|
Laurent Destailleur
|
85747c7383
|
Merge pull request #4400 from aspangaro/3.8-p1
Fix: #4394 Untranslated label in list of expense reports
|
2016-01-12 23:14:16 +01:00 |
|
Laurent Destailleur
|
5b26f456f4
|
Merge pull request #4356 from GPCsolutions/3.8-4291
FIX #4291 Correctly filter bank card GETPOSTs
|
2016-01-12 22:51:17 +01:00 |
|
fmarcet
|
79992b4947
|
FIX: The third dashboard don't consider user permissions
|
2016-01-12 11:34:50 +01:00 |
|
phf
|
f280061a90
|
FIX if we dont use SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE the hour is displayed on pdf
|
2016-01-12 11:09:47 +01:00 |
|
Frédéric FRANCE
|
92885065c6
|
Update facture.php
|
2016-01-12 10:09:02 +01:00 |
|
aspangaro
|
7552fa20eb
|
Fix: #4394 Untranslated label in list of expense reports
|
2016-01-11 21:18:12 +01:00 |
|