Commit Graph

47654 Commits

Author SHA1 Message Date
Laurent Destailleur
3f5fe432e7 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-03-28 17:18:10 +01:00
Laurent Destailleur
b60a56dc94 Fix search on command 2015-03-28 17:17:55 +01:00
frederic34
af92174ae2 Small correction but unable to make loan payment 2015-03-28 17:15:07 +01:00
Laurent Destailleur
253955dc31 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2015-03-28 17:13:05 +01:00
Laurent Destailleur
ffe1ee0d84 Target 98 to publish of dolibarr sevrer is now working 2015-03-28 17:12:31 +01:00
Laurent Destailleur
5e33068e29 Update doc 2015-03-28 16:51:25 +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
e777516f38 Merge pull request #2483 from FHenry/3.7
FIX : fetch actioncomm return 0 if no record found instead of nothing
2015-03-27 01:10:28 +01:00
Laurent Destailleur
d0e4d8046b Merge pull request #2480 from marcosgdf/minor-2
Corrected search box alignment in Customer orders list
2015-03-27 01:09:06 +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
78638a30cd Merge pull request #2477 from atm-maxime/3.6
Fix : Quantity displayed for virtual stock explanations was wrong
2015-03-27 01:01:37 +01:00
Laurent Destailleur
813cb36424 Merge pull request #2476 from fmarcet/3.7
Fix: Not using where on sellist
2015-03-27 00:50:48 +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
Florian HENRY
2e13479e8f Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-03-26 16:56:06 +01:00
Florian HENRY
26c29216d9 syntax 2015-03-26 16:55:13 +01:00
Laurent Destailleur
42c2c81e28 Fix detection of html was wrong with img 2015-03-26 12:05:52 +01:00
Laurent Destailleur
1ca95acbd7 Fix pb during export of agenda events
Conflicts:
	htdocs/exports/export.php
2015-03-26 11:23:21 +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
e59fed9f38 Corrected search box alignment in Customer orders list 2015-03-26 11:08:34 +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
Maxime Kohlhaas
b250c5588e Fix : Quantity displayed for virtual stock explanations was wrong 2015-03-25 16:11:36 +01:00
Laurent Destailleur
21b1f7cc26 Fix bad calculation of email for notifications 2015-03-25 14:51:12 +01:00