Laurent Destailleur
|
c1ebdd3b4f
|
Default url is home
|
2016-01-24 11:35: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 |
|
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 |
|
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
|
9642bb44dc
|
Merge pull request #4470 from aspangaro/develop-MA_CICE
New: Add a new Id. prof. for Morrocan
|
2016-01-22 04:17:13 +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
|
78ee675993
|
Merge pull request #4463 from frederic34/patch-9
Update card.php
|
2016-01-22 04:13:13 +01:00 |
|
Laurent Destailleur
|
d8cbe39c46
|
Merge pull request #4461 from frederic34/patch-8
total records for payment list
|
2016-01-22 04:13:02 +01:00 |
|
Laurent Destailleur
|
d7da972ead
|
Merge pull request #4460 from frederic34/patch-7
total records for deposit list
|
2016-01-22 04:12:49 +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
|
93b2013aa7
|
Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
htdocs/compta/bank/card.php
htdocs/projet/tasks/list.php
|
2016-01-22 03:29:55 +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
|
cc71445b45
|
Fix: Only one name for one same feature.
|
2016-01-22 02:41:51 +01:00 |
|
Laurent Destailleur
|
e6653ea14f
|
Merge pull request #4333 from defrance/patch-94
Parameters harmonization of hook call
|
2016-01-22 02:35:21 +01:00 |
|
Laurent Destailleur
|
d2f5f5c01f
|
Merge pull request #4266 from fappels/develop_multi_warehouse
Add shipping and dispatching from/to multiple warehouses
|
2016-01-22 02:26:25 +01:00 |
|
Laurent Destailleur
|
d7847a8ec8
|
Merge pull request #4256 from GPCsolutions/dolibarr-mysqli
[Qual] mysqli code review
|
2016-01-22 02:22:47 +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
|
e39fc95bd1
|
Merge pull request #4476 from aspangaro/develop-p3
Fix: Modify length of code journal for accountancy in bank account
|
2016-01-22 02:11:29 +01:00 |
|
Laurent Destailleur
|
600a4e961b
|
Merge pull request #4464 from frederic34/patch-10
typo
|
2016-01-22 02:11:01 +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 |
|