Commit Graph

46634 Commits

Author SHA1 Message Date
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
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
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
aspangaro
f778f47049 Add dirs 2015-03-25 21:46:08 +01:00
aspangaro
679391d337 Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc 2015-03-25 20:59:48 +01:00
Laurent Destailleur
f7b8a2b036 Restore align=right 2015-03-25 18:13:53 +01:00
Laurent Destailleur
ab739e162c Merge remote-tracking branch 'origin/3.7' into develop 2015-03-25 18:11:29 +01:00
Laurent Destailleur
8be08c692f Fix some secuity tests were not done. 2015-03-25 18:10:45 +01:00
frederic34
19540b14b5 Add last shipments to company card 2015-03-25 16:38:18 +01:00
Laurent Destailleur
21b1f7cc26 Fix bad calculation of email for notifications 2015-03-25 14:51:12 +01:00
Laurent Destailleur
cc2d86bd58 Status of project was not visible on thirdparty card 2015-03-25 14:31:04 +01:00
Laurent Destailleur
f0fb6f1b2c Work on md theme 2015-03-24 22:24:15 +01:00
Laurent Destailleur
a32fc9efce Hide logo when option MAIN_OPTIMIZEFORTEXTBROWSER is set.
Avoid logo to overwrap box with css.
Add help text.
2015-03-24 14:08:56 +01:00
Laurent Destailleur
f75c115140 Fix translation
Fix permission not managed into get_menudiv.php
2015-03-24 11:19:51 +01:00
aspangaro
9d34b40897 Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc
Conflicts:
	htdocs/compta/bank/account.php
2015-03-24 05:28:57 +01:00
Laurent Destailleur
b884b28991 Include module loan 2015-03-23 23:39:14 +01:00
Laurent Destailleur
6c4369b7ba Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-03-23 23:29:14 +01:00
Laurent Destailleur
efe9c21b81 Merge pull request #2382 from aspangaro/develop-loan
NEW: Module loans
2015-03-23 23:28:57 +01:00