lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
49,683 Commits 43 Branches 150 Tags 886 MiB
8d47a307bb
Commit Graph

49683 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
philippe grand
12275871a8 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2015-10-02 11:29:35 +02:00
Regis Houssin
8912e111a3 Fix: wrong date format 2015-10-02 11:21:23 +02:00
Juanjo Menent
cfa6938e5e Merge pull request #3637 from hregis/develop_origin 
Fix: sql error, status is an integer
 2015-10-02 11:11:39 +02:00
Juanjo Menent
f33d6de8c1 Merge pull request #3636 from frederic34/patch-10 
Update index.php
 2015-10-02 11:10:46 +02:00
Juanjo Menent
4c1e018ded Merge pull request #3621 from fmarcet/3.8 
FIX Only are showing one object linked
 2015-10-02 11:03:19 +02:00
Regis Houssin
65935c6603 Fix: copy/paste error 2015-10-02 10:46:32 +02:00
Regis Houssin
6f9b0e1053 Fix: sql error, status is an integer 2015-10-02 10:37:08 +02:00
Frédéric FRANCE
6e947add92 Update index.php 2015-10-02 08:58:09 +02:00
Laurent Destailleur
53269a2703 Removed old theme with no maintener. 2015-10-01 23:27:41 +02:00
Laurent Destailleur
fcf3a0966c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-10-01 23:19:58 +02:00
Laurent Destailleur
3f8b95de77 Work on default theme 2015-10-01 23:19:50 +02:00
Laurent Destailleur
f11fd22809 More accurate message 2015-10-01 22:27:02 +02:00
Laurent Destailleur
5ad665d00c Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-10-01 16:50:52 +02:00
Laurent Destailleur
60c0338d64 FIX #3628 2015-10-01 16:50:18 +02:00
Laurent Destailleur
e76124add5 FIX #3606 2015-10-01 16:09:51 +02:00
Florian HENRY
fd29bb34be FIX : Mass Mailing activity don't display all status 2015-10-01 16:09:04 +02:00
Laurent Destailleur
4201e8b032 FIX #3630 - Wrong balance report when module salaries and donation 
disabled
 2015-10-01 14:38:31 +02:00
Laurent Destailleur
e2a88cd010 Merge pull request #3626 from GPCsolutions/3.8-3607 
FIX #3607 Better categories setting and unsetting
 2015-10-01 13:59:05 +02:00
Laurent Destailleur
09e5d71796 Merge pull request #3631 from hregis/develop_origin 
Fix: missing llx_const encryption
 2015-10-01 13:57:47 +02:00
Laurent Destailleur
4057d682f1 Merge pull request #3633 from hregis/develop_bug 
Fix: avoid error during update if db port not defined
 2015-10-01 13:56:48 +02:00
Regis Houssin
45a70d7dc3 Fix: wrong test 2015-10-01 12:41:29 +02:00
Regis Houssin
1c023e291c Fix: avoid error during update if db port not defined 2015-10-01 12:35:38 +02:00
Regis Houssin
259f7af3e6 Fix: missing llx_const encryption 2015-10-01 12:06:45 +02:00
Laurent Destailleur
b57c156b60 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/core/modules/modContrat.class.php
	htdocs/fichinter/card.php
	htdocs/install/upgrade2.php
 2015-10-01 11:16:35 +02:00
Laurent Destailleur
076f2ed9d1 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/core/lib/security.lib.php
 2015-10-01 11:10:47 +02:00
Laurent Destailleur
72c31c0fa9 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2015-10-01 10:48:28 +02:00
Laurent Destailleur
4da8fb901b Add comment 2015-10-01 10:48:09 +02:00
Laurent Destailleur
1907e5da54 Merge pull request #3619 from atm-arnaud/3.6_fix_facturestat 
FIX facturestat bad sql when customer view is limited
 2015-10-01 10:48:05 +02:00
Laurent Destailleur
34adc60d26 Merge pull request #3618 from atm-alexis/fix_event_for_user_restricted_if_no_company 
FIX error in SQL due to a previous fix
 2015-10-01 10:35:07 +02:00
Laurent Destailleur
9c28894ec3 Merge pull request #3615 from FHenry/3.7 
FIX : When delete actioncomm also delete actioncomm_resources
 2015-10-01 10:34:54 +02:00
Laurent Destailleur
0c64fa04bc Merge pull request #3614 from marcosgdf/bug-3572 
FIX #3572 Impossible to attach project in order. The option to use autocompletion for project failed.
 2015-10-01 10:32:32 +02:00
Laurent Destailleur
9c4a12b9d4 Merge pull request #3613 from aspangaro/develop-68 
Fix : remove viewport for mobile device already declared
 2015-10-01 10:29:39 +02:00
Laurent Destailleur
74fb718b77 Merge pull request #3612 from grandoc/3.7 
missing translation
 2015-10-01 10:28:27 +02:00
Laurent Destailleur
d4b5256f18 Merge pull request #3611 from atm-alexis/develop 
FIX there is no way to hide or change qty by hook
 2015-10-01 10:27:26 +02:00
Laurent Destailleur
9901406634 A paswword can be set on member card but member can't login. Too much 
work to fix this into a stable version, so I just introduce a warning to
explain why and how to solve this.
 2015-10-01 10:15:07 +02:00
Laurent Destailleur
71ccdb5cfb FIX Payment form for paypal and paybox was not centered. 2015-09-30 19:37:41 +02:00
Laurent Destailleur
c7e05d2473 Add field pass_crypted to uniformize fields between members and users. 2015-09-30 19:27:36 +02:00
Laurent Destailleur
747c49862c Try to solve a flush pb 2015-09-30 19:15:45 +02:00
Laurent Destailleur
7037679718 FIX When update a member login for a member linked to a user, the login 
of user was not sync (not updated).
 2015-09-30 19:15:09 +02:00
Raphaël Doursenaud
f0466ba313 FIX #3607 Better categories setting and unsetting 
This allows triggering CATEGORY_LINK and CATEGORY_UNLINK each time.
 2015-09-30 18:47:02 +02:00
Florian HENRY
a96b92a618 FIX : Email selector contact must not include inactive contact 2015-09-30 14:06:45 +02:00
Laurent Destailleur
d59f62cd75 Sync transifex 2015-09-30 01:25:35 +02:00
Laurent Destailleur
673ce059e6 Fix locale for nl_BE must match netherland language 2015-09-29 23:55:38 +02:00
Florian HENRY
e209fb23a2 FIX : Admin fiche inter page do not take good action 2015-09-29 18:27:39 +02:00
Florian HENRY
fecd213bb8 FIX: display error on extrafields on ficheinter 2015-09-29 16:57:05 +02:00
Laurent Destailleur
1108656d19 NEW Can set color of the highlight hover line 2015-09-29 15:58:24 +02:00
Florian HENRY
bb0de1dcad FIX : update2.php test res befre assign it 2015-09-29 15:00:11 +02:00
Laurent Destailleur
1851310bbe NEW Add cancel button on thirdparty create page 2015-09-29 14:31:55 +02:00
Laurent Destailleur
60c6510fc1 NEW Can set default value of event type when creating an event (if type 
of event option is used).
 2015-09-29 14:17:03 +02:00
Florian HENRY
766b8535ae spacing 2015-09-29 09:47:23 +02:00