lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
48,330 Commits 43 Branches 150 Tags 886 MiB
bddee5d01f
Commit Graph

48330 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
9d7806f1f4 Tag class as deprecated 2015-06-27 21:26:05 +02:00
Laurent Destailleur
a220a8696d Merge pull request #3111 from hregis/3.7_photos 
Fix: change encrypt/decrypt method for avoid division by zero
 2015-06-27 21:13:17 +02:00
Regis Houssin
5efea745a1 Fix: Public method name must not be prefixed with an underscore 2015-06-27 20:38:11 +02:00
Regis Houssin
5ac292f9ae Fix: Private member variable must be prefixed with an underscore 2015-06-27 20:32:19 +02:00
Regis Houssin
bf9c7c8ef9 Fix: add private/public function 2015-06-27 20:26:40 +02:00
Regis Houssin
dfae24ded9 Fix: remove unused var 2015-06-27 20:20:27 +02:00
Regis Houssin
bfe7112308 Fix: change encrypt/decrypt method for avoid division by zero 2015-06-27 19:57:35 +02:00
Regis Houssin
ab558f8ea9 Fix: Use hooks (Multicompany) 2015-06-27 16:32:01 +02:00
Laurent Destailleur
55cb103ab0 Maxi debug of new module leave requests 2015-06-27 13:01:44 +02:00
Laurent Destailleur
b6efa5ed11 NEW Can upload files on leave requests. Use more standard permissions. 2015-06-27 11:45:23 +02:00
Laurent Destailleur
e02915cf8d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-06-27 09:56:57 +02:00
Laurent Destailleur
22a2038a65 Merge pull request #3108 from simnandez/3.7 
FIX #3091 TotalHT amount in supplier order is bold unlike the rest of
 2015-06-27 02:38:21 +02:00
Laurent Destailleur
6ed99db818 Merge pull request #3107 from simnandez/develop 
Transifex Syncro
 2015-06-27 02:38:05 +02:00
Laurent Destailleur
faccb3666e Avoid to include tested module 2015-06-27 02:34:28 +02:00
Laurent Destailleur
be92f5e7a0 Fix syntax error 2015-06-27 02:31:26 +02:00
Laurent Destailleur
06b21d0b42 Merge branch 'aspangaro-develop-patch43' into develop 2015-06-27 02:27:59 +02:00
Laurent Destailleur
ceb9955efc Merge branch 'develop-patch43' of https://github.com/aspangaro/dolibarr into aspangaro-develop-patch43 
Conflicts:
	htdocs/contact/list.php
 2015-06-27 02:27:34 +02:00
Laurent Destailleur
6faf6eeb4f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-06-27 02:21:43 +02:00
Laurent Destailleur
b3d1df3786 Merge pull request #3109 from hregis/develop_new 
New: Possibility to add javascript in main login page with
 2015-06-27 02:19:50 +02:00
Laurent Destailleur
bae8ed2356 uniformize code 2015-06-27 02:19:46 +02:00
Regis Houssin
c05bf7e977 New: Possibility to add javascript in main login page with 
"getLoginPageOptions" hook
 2015-06-26 19:37:37 +02:00
Juanjo Menent
0f046776d5 FIX #3091 TotalHT amount in supplier order is bold unlike the rest of 
Dolibarr
 2015-06-26 17:54:34 +02:00
Juanjo Menent
8b78ef5e18 Transifex Syncro 2015-06-26 17:45:02 +02:00
Juanjo Menent
ba97763ac4 Transifex Syncro 2015-06-26 17:40:47 +02:00
Laurent Destailleur
0fe0c989ca Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-06-26 17:36:54 +02:00
Juanjo Menent
a5b3c3476d Merge pull request #3106 from hregis/3.7_bug 
Fix: missing table
 2015-06-26 17:35:24 +02:00
Juanjo Menent
b0b7c4990e Merge pull request #3105 from hregis/3.7_photos 
Fix: for avoid error with function "complete_head_from_modules"
 2015-06-26 17:30:13 +02:00
Laurent Destailleur
2bc6d6dd4c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-06-26 17:26:12 +02:00
Laurent Destailleur
5584acddbd Content of popup tooltip on contact and login link 2015-06-26 17:21:03 +02:00
Regis Houssin
7ec13c9435 Merge remote-tracking branch 'origin/3.7' into 3.7_bug 2015-06-26 16:56:41 +02:00
Laurent Destailleur
8f691138e8 NEW Can edit Background color for Top menu and Background color for 
table title line (works only with theme menu eldy).
 2015-06-26 16:21:09 +02:00
Regis Houssin
46272cf4cd Fix: for avoid error with function "complete_head_from_modules" 2015-06-26 15:26:08 +02:00
Laurent Destailleur
57b0de25e2 NEW Add option THEME_ELDY_DISABLE_IMAGE to disable images into menu 
eldy.
 2015-06-26 14:44:06 +02:00
Laurent Destailleur
936c46d219 Better error/setup messages. 2015-06-26 13:18:40 +02:00
aspangaro
f9831f908e Use print_liste_field_titre(); 2015-06-26 06:49:43 +02:00
aspangaro
9d2e964b00 Fix: print_liste_field_titre(''); 2015-06-26 06:23:29 +02:00
aspangaro
cd282568e8 Merge remote-tracking branch 'Upstream/develop' into develop-42 2015-06-26 05:39:05 +02:00
aspangaro
cb36a919b5 HRM area : Show Ref instead of id for expense report 2015-06-26 05:34:12 +02:00
alainabbas
865814052d Merge pull request #1 from alainabbas/alainabbas-patch-1 
FIX|Fix #3050 Odt to PDF generation error in draft mode
 2015-06-25 21:00:35 +02:00
alainabbas
efd3c4d863 Correct bug #3050 
when a piece is in draft and odt2pdf.sh is used, the filename is not corrected escaped for the shell
 2015-06-25 20:57:01 +02:00
Juanjo Menent
a3b3ce9c77 Merge pull request #3101 from FHenry/3.7 
FIX: multicompny bug with getEntites without shared test
 2015-06-25 20:50:03 +02:00
Juanjo Menent
967e7ea457 Merge pull request #3099 from GPCsolutions/dolibarr-3098 
Updated jQuery BlockUI plugin to a version compatible with shipped jQuery
 2015-06-25 20:46:41 +02:00
Juanjo Menent
ba984254a5 Merge pull request #3096 from GPCsolutions/replaceaddress 
Allow replacing the address block
 2015-06-25 20:45:26 +02:00
Juanjo Menent
a8e3a8809b Merge pull request #3095 from netfab/3.7 
Missing space after title tag.
 2015-06-25 20:43:57 +02:00
Juanjo Menent
0f6aaf1461 Merge pull request #3094 from aspangaro/develop-patch41 
Accounting - Add field to edit in admin
 2015-06-25 20:42:37 +02:00
Juanjo Menent
d6b15d1be8 Merge pull request #3093 from aspangaro/develop-patch40 
Move ACCOUNTING_VAT_ACCOUNT to ACCOUNTING_VAT_SOLD_ACCOUNT
 2015-06-25 20:41:56 +02:00
Florian HENRY
9505d3a528 fix multicompny bug with getEntites without shared test 2015-06-25 17:22:37 +02:00
Raphaël Doursenaud
b219381e04 Fix #3098 Updated jQuery BlockUI plugin to 2.70.0 2015-06-25 15:47:26 +02:00
Raphaël Doursenaud
63a3d2f760 Updated jQuery versions in COPYRIGHT 
Actual library update has been done at a3a5b0d
 2015-06-25 15:43:34 +02:00
Raphaël Doursenaud
d6e48670e7 Allow replacing the address block 
Since ba2c0a2651 changed the default hook mode
from addreplace to output, this is needed to still be allowed to replace
the displayed address from a hook
 2015-06-25 11:13:23 +02:00