Commit Graph

46651 Commits

Author SHA1 Message Date
Laurent Destailleur
a3b5f35903 Merge pull request #2501 from frederic34/patch-5
Travis Fix for donation.lib.php
2015-03-30 02:00:14 +02:00
Laurent Destailleur
b66d8c9afc Merge pull request #2496 from aspangaro/develop-ER-patch1
Fixed: HRM menu is not activated when only Expense Report module is acti...
2015-03-30 01:59:50 +02:00
Laurent Destailleur
f53c36cea2 Merge pull request #2503 from aspangaro/develop-ReviewAssoc
New: Add management for accounting account in admin donation & debug
2015-03-30 01:59:29 +02:00
aspangaro
c22a563422 New: Add management for accounting account in admin donation & correct bugs 2015-03-29 21:04:20 +02:00
Frédéric FRANCE
bcd7516e25 Fix for donation.lib.php 2015-03-29 18:22:45 +02:00
Laurent Destailleur
73b2e0bd01 Merge pull request #2471 from marcosgdf/refactor
refactor
2015-03-29 16:17:36 +02:00
aspangaro
a715ccfcb8 Fixed: HRM menu is not activated when only Expense Report module is activated 2015-03-29 15:11:41 +02:00
Laurent Destailleur
661961876a Merge pull request #2485 from aspangaro/develop-patch2
Fix: Missing language key
2015-03-29 15:05:37 +02:00
Laurent Destailleur
af51415f8e Merge pull request #2486 from frederic34/patch-2
PhotoInTooltip for getNomUrl company
2015-03-29 15:05:25 +02:00
Laurent Destailleur
32bda97712 Merge pull request #2494 from aspangaro/develop-ReviewAssoc
New: Review module donation
2015-03-29 15:04:22 +02:00
Laurent Destailleur
b4c096de09 Merge pull request #2495 from frederic34/loan
Debug payment loan
2015-03-29 15:03:08 +02:00
aspangaro
96b7cac93f Delete useless line 2015-03-29 14:30:43 +02:00
aspangaro
ed493b651b Icons & fr_FR options not show 2015-03-29 14:29:53 +02:00
frederic34
7b9ba4bd26 debug payment 2015-03-29 13:37:17 +02:00
frederic34
bf3e78a63d Debug payment loan 2015-03-29 11:39:55 +02:00
aspangaro
a92f68a5ed Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc 2015-03-29 09:25:06 +02:00
aspangaro
c733249c75 Don Remove old file 2015-03-29 09:23:39 +02:00
aspangaro
ce6df7c022 Debug 2015-03-29 09:20:32 +02:00
Laurent Destailleur
4887a28f91 Merge pull request #2492 from IonAgorria/mc-fix
Fix: Check if $mc is a valid global
2015-03-28 18:20:28 +01:00
Laurent Destailleur
cc5bdf85af Merge pull request #2493 from GPCsolutions/github-issues
Contribution guidelines update
2015-03-28 18:19:34 +01:00
Laurent Destailleur
0c1a51ddae Merge pull request #2489 from frederic34/loan
Note private and Note public for loan
2015-03-28 18:09:21 +01:00
frederic34
be1595a187 Add tab for notes 2015-03-28 17:42:33 +01:00
frederic34
af92174ae2 Small correction but unable to make loan payment 2015-03-28 17:15:07 +01:00
Raphaël Doursenaud
ad8214884d Added documentation to contribution guidelines 2015-03-28 16:10:29 +01:00
Raphaël Doursenaud
91632ea431 Added GitHub for issue tracking to contribution guidelines 2015-03-28 16:01:33 +01:00
frederic34
7282a6faf2 Trans in Loan Calculator 2015-03-28 10:59:10 +01:00
frederic34
680317f250 Trans in Loan Calculator 2015-03-28 10:02:33 +01:00
Ion Agorria
1791631976 check if $mc is a valid global 2015-03-28 03:44:16 +01:00
frederic34
a0c7cedaf1 Tooltip for loan 2015-03-27 18:09:00 +01:00
frederic34
631c3d72e3 Correction for notes 2015-03-27 17:23:27 +01:00
frederic34
82b8fe6b7d Note private and Note public for loan 2015-03-27 17:13:52 +01:00
Frédéric FRANCE
375e0b7e2a PhotoInTooltip for getNomUrl company 2015-03-27 08:32:51 +01:00
aspangaro
9d25a1c7ed Fix: Missing language key 2015-03-27 06:59:21 +01:00
aspangaro
77b123cb2d Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc 2015-03-27 06:30:35 +01:00
Laurent Destailleur
f6df1d6380 Update to match new issue tracker 2015-03-27 02:26:12 +01:00
Laurent Destailleur
cb16e069df Better explanation 2015-03-27 01:17:21 +01:00
Laurent Destailleur
39f46227c8 Merge pull request #2479 from marcosgdf/minor
Merge branch 'develop' into minor
2015-03-27 01:08:23 +01:00
Laurent Destailleur
60c24f7162 Merge pull request #2478 from frederic34/listexpe
Add last shipments to company card
2015-03-27 01:04:05 +01:00
Laurent Destailleur
dea6b534fb Merge pull request #2484 from aspangaro/develop-patch1
FIXED: Correct path of loan class
2015-03-27 00:44:12 +01:00
aspangaro
f0823a215b Add language key 2015-03-26 21:16:52 +01:00
aspangaro
4209deafd2 Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc 2015-03-26 21:04:20 +01:00
aspangaro
6a0916b3fa Correct path 2015-03-26 21:03:56 +01:00
aspangaro
a39f81b1a6 FIXED: Correct path of loan class 2015-03-26 20:51:27 +01:00
aspangaro
059bb40345 Debug 2015-03-26 20:43:34 +01:00
Laurent Destailleur
ce8bd7a515 Fix pb during export of agenda events 2015-03-26 11:20:39 +01:00
Marcos García de La Fuente
b83ef4c1ec Merge branch 'develop' into minor 2015-03-26 10:58:35 +01:00
Marcos García de La Fuente
50a3563f03 Minor correction to the product list of a supplier 2015-03-26 10:57:13 +01:00
aspangaro
b60f1e33d6 Debug 2015-03-26 06:29:16 +01:00
aspangaro
8d4ceadd7e Dir "Don" 2015-03-25 22:38:44 +01:00
aspangaro
2b2b43afb6 Dir "Don" 2015-03-25 22:37:14 +01:00