aspangaro
|
0899e7392b
|
Fix: typo on finance journal
|
2015-11-22 22:11:22 +01:00 |
|
Laurent Destailleur
|
0c958521ac
|
Fix cleaning of lines was not working
|
2015-11-22 17:46:25 +01:00 |
|
Laurent Destailleur
|
73bcc3bfe3
|
The temp dir for cache used by rester is correctly managed: No temp or
data files must be stored outside of documents directory.
|
2015-11-22 17:39:13 +01:00 |
|
Laurent Destailleur
|
296e04022f
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2015-11-22 17:19:45 +01:00 |
|
Laurent Destailleur
|
99fa751edc
|
Test lib is available
|
2015-11-22 17:19:20 +01:00 |
|
Laurent Destailleur
|
3c55479705
|
Restler #3544
|
2015-11-22 17:17:06 +01:00 |
|
Laurent Destailleur
|
3aa25cd2be
|
Merge pull request #4064 from frederic34/escpos
Add profile escpos printer
|
2015-11-22 17:09:15 +01:00 |
|
Laurent Destailleur
|
91f1acd1f1
|
Merge pull request #4063 from grandoc/develop
fix : Typo and translation
|
2015-11-22 17:07:22 +01:00 |
|
Laurent Destailleur
|
3f87b30327
|
Use same way to obfuscate key than password
|
2015-11-22 14:21:12 +01:00 |
|
frederic34
|
6b4b70bdbb
|
translations and help
|
2015-11-22 14:11:33 +01:00 |
|
Laurent Destailleur
|
a94aedb171
|
Minor css fix
|
2015-11-22 12:33:56 +01:00 |
|
Laurent Destailleur
|
cb3765bc92
|
Debug module Resource
|
2015-11-22 12:23:10 +01:00 |
|
Laurent Destailleur
|
e438d76df9
|
NEW Option encrypt password into databae is set to on by default on
first install.
|
2015-11-22 11:32:31 +01:00 |
|
frederic34
|
bfd97d5226
|
Add profile escpos printer
|
2015-11-22 11:04:27 +01:00 |
|
philippe grand
|
f4c8b5e7f8
|
missing translation
|
2015-11-22 10:46:17 +01:00 |
|
philippe grand
|
210c6c67cd
|
better translation and missing translation
|
2015-11-22 10:40:04 +01:00 |
|
philippe grand
|
9cdf0f427e
|
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop
|
2015-11-22 10:15:57 +01:00 |
|
Laurent Destailleur
|
c7447b0899
|
Add thirdparty of project into project summary of project home page.
Total use a different color
|
2015-11-21 20:25:28 +01:00 |
|
Laurent Destailleur
|
6f7a3f2c66
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2015-11-21 20:00:50 +01:00 |
|
Laurent Destailleur
|
e3c6e4ebe5
|
NEW Add planned workload and declared progress on project summary list
on project home page (data aggregated from tasks of project)
|
2015-11-21 20:00:38 +01:00 |
|
philippe grand
|
0408e309f8
|
fix : Typo and translation
|
2015-11-21 19:13:34 +01:00 |
|
Laurent Destailleur
|
7b0a9fabab
|
FIX Order last name / firstname in user list must be done according to
option
|
2015-11-21 18:26:25 +01:00 |
|
Laurent Destailleur
|
c8cf06c14b
|
Merge pull request #4059 from fappels/develop_fix_defineBuyPrice
Fix defineBuyPrice no min price is not error
|
2015-11-21 17:53:59 +01:00 |
|
Laurent Destailleur
|
50cfd38e62
|
Merge pull request #4047 from grandoc/develop
[Qual] Uniformize code
|
2015-11-21 17:45:15 +01:00 |
|
philippe grand
|
e78794cab2
|
[Qual] Uniformize code
|
2015-11-21 17:38:09 +01:00 |
|
philippe grand
|
55bab28b9c
|
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop
|
2015-11-21 17:15:56 +01:00 |
|
Laurent Destailleur
|
c15c0f6fbb
|
Minor css fix
|
2015-11-21 15:31:27 +01:00 |
|
Laurent Destailleur
|
548ff26628
|
Focus on textarea works also when ckeditor is on
|
2015-11-21 13:42:01 +01:00 |
|
Laurent Destailleur
|
2a345b6fc0
|
Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
htdocs/admin/company.php
htdocs/admin/menus/edit.php
htdocs/core/class/hookmanager.class.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/pdf.lib.php
|
2015-11-21 12:48:41 +01:00 |
|
fappels
|
ecd3114683
|
Fix defineBuyPrice no min price is not error
No min buy price is not error, return 0 if no buyprice set
|
2015-11-21 12:35:45 +01:00 |
|
Laurent Destailleur
|
758b8e1f7e
|
Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
htdocs/core/boxes/box_project.php
|
2015-11-21 12:32:03 +01:00 |
|
fappels
|
0892724ffe
|
Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop
|
2015-11-21 12:29:49 +01:00 |
|
Laurent Destailleur
|
c04743aa84
|
Merge remote-tracking branch 'origin/3.6' into 3.7
|
2015-11-21 12:23:51 +01:00 |
|
philippe grand
|
32f420eefa
|
[Qual] Uniformize code
|
2015-11-21 05:20:08 +01:00 |
|
philippe grand
|
928c44b04f
|
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop
|
2015-11-21 04:52:19 +01:00 |
|
Laurent Destailleur
|
69757210ce
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2015-11-21 02:40:21 +01:00 |
|
Laurent Destailleur
|
2eba3c9e81
|
Comment
|
2015-11-21 02:39:49 +01:00 |
|
Laurent Destailleur
|
30f0b6e2e8
|
Merge pull request #4046 from marcosgdf/bug-4016
FIX #4016 User link is not correctly formed in emailing receivers
|
2015-11-21 02:14:08 +01:00 |
|
Laurent Destailleur
|
c77eaeaa77
|
Merge pull request #4040 from atm-arnaud/3.6_fix_export_category_contact
FIX export with category contact extrafields
|
2015-11-21 02:09:32 +01:00 |
|
Laurent Destailleur
|
94fdff9a46
|
Merge pull request #4045 from marcosgdf/bug-4043
FIX #4043 Incorrect translation in error mesage in menu creation admin page
|
2015-11-21 02:08:55 +01:00 |
|
Laurent Destailleur
|
07d24a9a05
|
Merge pull request #4044 from atm-arnaud/3.7_fix_project_box_nb_task
FIX Nb of tasks and percent progress in box project
|
2015-11-21 02:08:00 +01:00 |
|
Laurent Destailleur
|
bfaa8d539f
|
Merge pull request #4039 from frederic34/patch-9
typo
|
2015-11-21 01:51:56 +01:00 |
|
Laurent Destailleur
|
60724df496
|
Merge pull request #4038 from atm-maxime/develop
NEW add info page on product card
|
2015-11-21 01:51:32 +01:00 |
|
Laurent Destailleur
|
9db71098ac
|
Merge pull request #4031 from FHenry/develop
PG SQL
|
2015-11-21 01:50:47 +01:00 |
|
Laurent Destailleur
|
1bea9917c4
|
Introduce version on resource link, so no cache effect after upgrading
|
2015-11-21 00:52:20 +01:00 |
|
Laurent Destailleur
|
a79e8d33f1
|
FIX Bad meteo icon
|
2015-11-21 00:43:35 +01:00 |
|
Laurent Destailleur
|
97dc4c346b
|
Merge pull request #4026 from aspangaro/develop-hrm
New: FR #3699 HRM Add address informations in user card
|
2015-11-21 00:27:29 +01:00 |
|
Laurent Destailleur
|
45d6635bf6
|
Merge pull request #4025 from ndrosis/3.8
FIX utf-8 characters in the mask mercure does not break counter
|
2015-11-21 00:26:38 +01:00 |
|
Laurent Destailleur
|
611d8f3e86
|
Merge pull request #4021 from defrance/patch-75
add odt feature on supplier admin page
|
2015-11-21 00:24:15 +01:00 |
|
Laurent Destailleur
|
a906774595
|
Merge pull request #3979 from atm-alexis/3.9_NEW_add_billed_status_for_supplier_order
NEW 3.9 add billed status for supplier order
|
2015-11-21 00:20:17 +01:00 |
|