Commit Graph

51549 Commits

Author SHA1 Message Date
Frédéric FRANCE
e3443365d2 Navigation to loan list 2015-11-28 19:08:52 +01:00
Frédéric FRANCE
d178c1bf37 Update .travis.yml 2015-11-28 17:38:48 +01:00
Frédéric FRANCE
212fce2ab7 Create composer.json.phpcs 2015-11-28 17:36:03 +01:00
Laurent Destailleur
acbbb70c44 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-11-28 17:36:02 +01:00
Laurent Destailleur
3e403720e6 FIX User is selected when choosing menu "My projects"
Graph of opportunities is moved into an include file.
2015-11-28 17:35:52 +01:00
Laurent Destailleur
d00ebd54f9 Merge pull request #4107 from aspangaro/develop-member
Fix adherent width colomn of create type form
2015-11-28 16:32:34 +01:00
Laurent Destailleur
fcdb3af708 Merge pull request #4106 from aspangaro/develop-skype
New: Better integration of skype for dolibarr 3.9
2015-11-28 16:31:35 +01:00
Laurent Destailleur
e6806611a6 Merge pull request #4105 from atm-ph/fix_38_select_projects_list
FIX jquery select of project generate js error on change event
2015-11-28 16:30:21 +01:00
Laurent Destailleur
901f952cb9 Merge pull request #4103 from frederic34/patch-3
FIX: Navigation to resource list
2015-11-28 16:27:58 +01:00
Laurent Destailleur
e72f4cb063 Merge pull request #4102 from fmarcet/3.6
Fix: Bug when idprof is mandatory on thrid creation and we use multicompany
2015-11-28 16:27:16 +01:00
Laurent Destailleur
ae87a270e4 Merge pull request #4101 from aspangaro/3.7-accountancy
Fix #4069 Accountancy - button "export" don't work on finance journal
2015-11-28 16:26:36 +01:00
Laurent Destailleur
2ce00b2956 Merge pull request #4099 from GPCsolutions/3.6-4097
FIX #4097 Public holiday calculation
2015-11-28 16:11:28 +01:00
Laurent Destailleur
5b22eee938 FIX #4099 2015-11-28 16:11:15 +01:00
Laurent Destailleur
3485e351a4 Fix do not jump to top of page when clicking on "Link to order" 2015-11-28 15:46:20 +01:00
Laurent Destailleur
826c4de26b Uniformize and debug module expense report. 2015-11-28 15:28:59 +01:00
aspangaro
8bf66d2f58 Remove skype also in member card - already present in dol_banner 2015-11-28 15:09:08 +01:00
aspangaro
0a3ab4617c Fix adherent width colomn of create type form 2015-11-28 14:52:13 +01:00
aspangaro
d12e3ca91f Finish work on better integration of skype 2015-11-28 14:43:16 +01:00
Laurent Destailleur
88e76dcf64 Fix utf8 encoded twice 2015-11-28 14:40:23 +01:00
phf
cbcb79b1eb FIX jquery select of project generate js error on change event 2015-11-27 16:58:28 +01:00
Laurent Destailleur
eb02b8d944 Add fec format into iso-normes dir. 2015-11-27 09:05:29 +01:00
Frédéric FRANCE
4539d84609 Update .travis.yml 2015-11-27 00:35:07 +01:00
Frédéric FRANCE
e6033369a8 Update resource.class.php 2015-11-26 20:33:07 +01:00
Frédéric FRANCE
1b9039af36 Update list.php 2015-11-26 20:30:11 +01:00
fmarcet
208bf2545f Fix: Bug when idprof is mandatory on thrid creation and we use
multicompany
2015-11-26 17:14:03 +01:00
aspangaro
9817ce8b20 Merge remote-tracking branch 'Upstream/develop' into develop-skype 2015-11-26 07:12:04 +01:00
aspangaro
cb6038e125 Better code for admin skype 2015-11-26 07:10:13 +01:00
aspangaro
37da315af6 Remove old code 2015-11-26 06:30:09 +01:00
aspangaro
9a2259c681 Correct button 'Export' and 'Write bookkeeping' on finance journal 2015-11-26 06:19:24 +01:00
Laurent Destailleur
a6d8f943df Fix several bugs into leave requets module 2015-11-26 02:12:37 +01:00
Laurent Destailleur
b47dbc7a5f Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/install/pgsql/functions/functions.sql
	htdocs/projet/element.php
2015-11-26 01:32:21 +01:00
Laurent Destailleur
995db61110 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-11-26 01:28:10 +01:00
Laurent Destailleur
f814bc11a0 Clean packaging 2015-11-26 01:27:59 +01:00
Laurent Destailleur
4f3196edf2 Removed lib that are luxuary components. 2015-11-26 01:19:16 +01:00
Laurent Destailleur
1608fec937 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-11-26 00:47:29 +01:00
Laurent Destailleur
f353464bce Prepare code to fix #4095 2015-11-26 00:47:17 +01:00
Laurent Destailleur
a1a5eba2de Merge pull request #4096 from braito4/patch-1
Part solution bug #4095
2015-11-26 00:34:04 +01:00
Laurent Destailleur
a454e92656 Increase size of combo list 2015-11-26 00:31:12 +01:00
Laurent Destailleur
20b8a2d110 Merge pull request #4093 from frederic34/patch-7
remove a tab in lang
2015-11-26 00:22:14 +01:00
Laurent Destailleur
041fa8d3f3 Merge pull request #4083 from GPCsolutions/3.6-4081
FIX #4081 Added missing translation
2015-11-26 00:16:46 +01:00
Laurent Destailleur
bc6d04e495 Typo 2015-11-26 00:08:34 +01:00
Laurent Destailleur
ddd0f8224f Picto was not visible onto login page, we keep this behaviour. 2015-11-26 00:08:24 +01:00
Laurent Destailleur
02ac828e4c Merge pull request #4075 from GPCsolutions/dolibarr-4074
Fix #4074 Properly save user theme settings
2015-11-25 23:51:30 +01:00
Laurent Destailleur
f79aeeeb0b Merge pull request #4068 from aspangaro/develop-accountancy
Fix: typo on finance journal
2015-11-25 23:33:29 +01:00
Laurent Destailleur
8746ee1310 Merge pull request #4067 from aspangaro/develop-donation
NEW: Donation complete cerfa 11580*03 Fr - Thanks Benoit21
2015-11-25 23:33:13 +01:00
Laurent Destailleur
9d10533f3d Merge pull request #4066 from aspangaro/develop-hrm
Fix: Auguria Menu & wrong table in dictionary HRM
2015-11-25 23:32:36 +01:00
Laurent Destailleur
ad087a75e6 Fix missing php 2015-11-25 23:32:00 +01:00
Laurent Destailleur
85d788d43a Fix crazy phpcs test 2015-11-25 23:26:31 +01:00
Laurent Destailleur
66a1becbf9 Merge pull request #4065 from frederic34/patch-5
Typo
2015-11-25 23:21:39 +01:00
Laurent Destailleur
2d8c2221d8 NEW Provide an easier way to understand if an order can be shipped. 2015-11-25 23:20:41 +01:00