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

48246 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
b25d2ff00a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/main.inc.php
 2015-06-27 22:00:56 +02:00
Laurent Destailleur
0cbf92c716 Merge pull request #3110 from hregis/develop_strict 
Fix: Use hooks (Multicompany)
 2015-06-27 21:56:36 +02:00
Laurent Destailleur
0a2bafaa6d The trigger USER_LOGIN* are deprecated. They are still working but you 
should prefer use the hook afterLogin or afterLoginFailed instead.
 2015-06-27 21:52:23 +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
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
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
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
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
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
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
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
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
aspangaro
e20da5511d Accounting - Add field to edit in admin 2015-06-25 06:54:19 +02:00
aspangaro
452733263d Move ACCOUNTING_VAT_ACCOUNT to ACCOUNTING_VAT_SOLD_ACCOUNT 2015-06-25 06:37:26 +02:00
Laurent Destailleur
1485ead215 Fix: MARGIN_TYPE == 2 is "using PMP price" so i remove a duplicate 
option to get same behaviour.
 2015-06-24 21:36:28 +02:00
Laurent Destailleur
a7aaa89e49 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-06-24 18:33:04 +02:00
Juanjo Menent
759aec3925 Merge pull request #3084 from aspangaro/develop-patch37 
Fix: ER button set_paid & merge with old option setPaid
 2015-06-24 18:27:25 +02:00
Juanjo Menent
fc9d54fdaa Merge pull request #3088 from atm-maxime/develop 
New : add stats by qty on report turnover by product (+ clean code)
 2015-06-24 18:23:31 +02:00
Juanjo Menent
044edaaefc Merge pull request #3092 from FHenry/develop 
NEW : add extrafields into import product
 2015-06-24 18:20:47 +02:00
Juanjo Menent
9080470a64 Merge pull request #3089 from aspangaro/develop-patch39 
Fix travis
 2015-06-24 18:18:36 +02:00
Laurent Destailleur
fcc9fc6672 Fix translation 2015-06-24 16:54:44 +02:00
Florian HENRY
daab394c81 add extrafields into import product 2015-06-24 12:40:56 +02:00
aspangaro
b4b5dedaa9 Merge remote-tracking branch 'Upstream/develop' into develop-39 2015-06-24 07:02:48 +02:00
aspangaro
f65234e44f Fix travis 2015-06-24 07:01:15 +02:00
Laurent Destailleur
0780c84012 Fix missing payment mode into export invoice profile 2015-06-23 23:58:04 +02:00
Laurent Destailleur
bdba8f1f38 Fix courrent outstanding amount not visible 2015-06-23 23:33:25 +02:00
Maxime Kohlhaas
5e9c85c789 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2015-06-23 20:03:46 +02:00
Laurent Destailleur
040a643ee9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/expensereport/card.php
	htdocs/projet/element.php
 2015-06-23 18:34:39 +02:00
Laurent Destailleur
a23e2511b9 Removed useless tab 2015-06-23 18:11:21 +02:00