Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-21 17:01:19 +01:00
Code Issues Packages Projects Releases Wiki Activity
49,918 Commits 36 Branches 190 Tags
d71ccc4a0292f3bbdd449768b51a4c310f4e744c
Commit Graph

49918 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Florian HENRY
4f5e207f08 review 2015-09-29 09:45:04 +02:00
Laurent Destailleur
c05df2ab7e FIX Wizard for restore does not show import command 2015-09-29 09:11:13 +02:00
fmarcet
a585698b69 FIX: Only are showing one object linked 2015-09-29 08:49:11 +02:00
arnaud
0b7305d21a FIX facturestat bad sql when customer view is limited 2015-09-28 16:55:34 +02:00
Alexis ALGOUD
453ed8a05e FIX error in SQL due to a previous fix 2015-09-28 15:36:27 +02:00
Florian HENRY
0f27edad5d FIX : When delete actioncomm also delete actioncomm_resources 2015-09-28 10:14:19 +02:00
Marcos García de La Fuente
188489c8ef FIX #3572 Impossible to attach project in order 
Added missing file of commit 65d3f79

Close #3572
 2015-09-27 21:52:44 +02:00
Laurent Destailleur
3f506552e3 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/theme/md_exp/style.css.php
 2015-09-27 21:29:16 +02:00
Laurent Destailleur
fa9103fc97 FIX Bad title line in project view when using jmobile 2015-09-27 16:50:47 +02:00
Laurent Destailleur
1e2d06bcd1 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-09-27 16:02:44 +02:00
Laurent Destailleur
ff5f823bef FIX not responsive part for project page 2015-09-27 16:01:57 +02:00
aspangaro
0b266a8ee5 Fix : remove viewport for mobile device already declared 2015-09-27 14:15:09 +02:00
Grand Philippe
6f128907fe fix : Missing argument 1 for CommonDocGenerator::__construct() 2015-09-27 11:30:23 +02:00
philippe
1454d942ef missing translation 2015-09-27 11:06:45 +02:00
Laurent Destailleur
3381d8efdd Work on css 2015-09-27 01:59:48 +02:00
Laurent Destailleur
e1b969cb90 FIX Init into bad var 3.8.1 2015-09-26 16:52:58 +02:00
Laurent Destailleur
a097938ce5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-09-26 16:52:09 +02:00
Laurent Destailleur
f0d39a6a92 FIX Init into bad var 2015-09-26 16:51:51 +02:00