lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
47,289 Commits 43 Branches 150 Tags 886 MiB
c502dabd76
Commit Graph

47289 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
aspangaro
c502dabd76 Merge remote-tracking branch 'Upstream/develop' into develop-ER_project 2015-05-03 14:31:15 +02:00
aspangaro
c6306260c5 Fix: ER Search mode doesn't work 2015-05-03 14:25:37 +02:00
aspangaro
da272c6aac ER Typo 2015-05-03 14:24:20 +02:00
Laurent Destailleur
0479bd5a59 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/contrat/card.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/modules/modAdherent.class.php
 2015-05-03 13:00:39 +02:00
Juanjo Menent
6b9d5be3c2 Merge pull request #2745 from frederic34/patch-9 
Typo
 2015-05-03 11:01:32 +02:00
Juanjo Menent
edbef3d1da Merge pull request #2746 from frederic34/patch-10 
Typo
 2015-05-03 11:01:17 +02:00
Juanjo Menent
3966b6dfde Merge pull request #2747 from aspangaro/develop-accountancy_patch1 
Accountancy - Add key language & prepare journal for expense report
 2015-05-03 11:00:48 +02:00
Juanjo Menent
ea80386152 Merge pull request #2751 from aspangaro/develop-selectmonth 
New: Add option to show long or short (by default) label in select_month()
 2015-05-03 10:58:45 +02:00
aspangaro
be302ce5ae New: ER Add filter on amounts 2015-05-03 08:10:22 +02:00
aspangaro
55eecf3f25 ER add price format in total of list 2015-05-03 07:05:19 +02:00
aspangaro
6dfd125872 Spaces 4 : Stop Shouting ! 2015-05-03 06:25:50 +02:00
aspangaro
7062dc7b2e Spaces 3 : the darkside 2015-05-03 06:20:34 +02:00
aspangaro
3a5f6db571 Spaces 2 : return of the vilains 2015-05-03 06:18:21 +02:00
aspangaro
9aa336e0d0 Spaces !!! 2015-05-03 06:16:28 +02:00
aspangaro
8163563753 New: Add option to show long or short (by default) label in select_month() 2015-05-03 06:12:02 +02:00
aspangaro
315e9239ac Merge remote-tracking branch 'Upstream/develop' into develop-accountancy2 2015-05-02 06:45:53 +02:00
aspangaro
1174c67b07 Accountancy - Add key language & prepare journal for expense report 2015-05-02 06:42:06 +02:00
Frédéric FRANCE
d8af7a45f8 Typo 2015-05-01 19:10:47 +02:00
Frédéric FRANCE
e3f980e32c Typo 2015-05-01 18:44:27 +02:00
Juanjo Menent
6f6ff6697a Merge pull request #2742 from aspangaro/develop-ER_badge 
New: ER add badge on tab document
 2015-05-01 16:24:47 +02:00
Juanjo Menent
300d6532a1 Merge pull request #2740 from aspangaro/develop-devcamp 
Fix: ER Typo on variable $_SERVER, correct Link & traduce button
 2015-05-01 16:24:32 +02:00
Raphaël Doursenaud
31a8e38d37 Allow exporting projects without a third party 
FIX #2729

Conflicts:
	htdocs/core/modules/modProjet.class.php
 2015-05-01 16:01:57 +02:00
Raphaël Doursenaud
93937fe7f3 Allow exporting projects without a third party 
FIX #2729
 2015-05-01 15:58:36 +02:00
aspangaro
b0eee2976c New: ER add badge on tab document 2015-05-01 08:46:37 +02:00
aspangaro
b03a9dffeb Fix : ER Correct Link 2015-05-01 07:18:19 +02:00
aspangaro
95058607a4 Fix : ER Typo on all variable $_SERVER & traduce of button "Edit" not works 2015-05-01 07:13:04 +02:00
Juanjo Menent
29c9686b8e Merge pull request #2730 from GPCsolutions/dolibarr-2718 
Export task labels
 2015-04-30 21:02:17 +02:00
Juanjo Menent
40be94452d Merge pull request #2734 from GPCsolutions/unitfix 
Fix missing unit parameter
 2015-04-30 20:54:00 +02:00
Juanjo Menent
4a4630a4a3 Merge pull request #2735 from GPCsolutions/dolibarr-2632 
Add sensible default mode to directory creation
 2015-04-30 20:51:37 +02:00
Juanjo Menent
91767edd05 Fixed SQL table reference for members types in export 2015-04-30 20:50:05 +02:00
Juanjo Menent
0808de9a1e Merge pull request #2738 from GPCsolutions/dolibarr-2712 
Fixed SQL table reference for members types in export
 2015-04-30 20:33:35 +02:00
Raphaël Doursenaud
afc582a369 Fixed SQL table reference for members types in export 
FIX #2712
 2015-04-30 17:20:53 +02:00
Raphaël Doursenaud
2c44aa6742 Add sensible default mode to directory creation 
Fix #2632
 2015-04-30 16:22:01 +02:00
Raphaël Doursenaud
7b538d8842 Fix missing unit parameter 
Prevented the input of supplier invoices lines from working
 2015-04-30 15:59:20 +02:00
Raphaël Doursenaud
2058d21da9 Export task labels 
FIX #2718
 2015-04-30 11:43:42 +02:00
Laurent Destailleur
6b3c060d9c Fix doxygen 2015-04-30 00:07:30 +02:00
Laurent Destailleur
060d8a1a38 FIX Ref/label of product on contract line was not visible, nor into 
page, nor into PDF.
 2015-04-29 19:57:01 +02:00
Laurent Destailleur
83daa67cc6 FIX Description of contract line was not visible. 2015-04-29 19:15:14 +02:00
Laurent Destailleur
3b38949fc5 Fix bad link to linkedin networks 2015-04-28 21:57:54 +02:00
Laurent Destailleur
53bf90a3e2 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	ChangeLog
 2015-04-28 21:54:13 +02:00
Laurent Destailleur
b0071a7c6c Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/main.inc.php
 2015-04-28 21:14:17 +02:00
Laurent Destailleur
1a70e9c5f9 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-04-28 21:12:38 +02:00
Laurent Destailleur
b30ee6b3fa Better fix for #2725 2015-04-28 21:12:04 +02:00
Juanjo Menent
6cfd8d64f5 Change bugtracker to github in all maintened versions 2015-04-27 20:34:52 +02:00
Juanjo Menent
cfaaf56428 Change bugtracker to github in all maintened versions 2015-04-27 20:34:26 +02:00
Juanjo Menent
ebe1f4a74d -Activate const PRODUCT_USE_OLD_PATH_FOR_PHOTOS by default for old 
instances
-Update changelog for 3.7.1

Conflicts:
	ChangeLog
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2015-04-27 20:31:12 +02:00
Laurent Destailleur
416e34d50d Fix error management 2015-04-27 20:26:56 +02:00
Laurent Destailleur
f9a428d550 Fixed #2714 2015-04-27 20:25:02 +02:00
Laurent Destailleur
b619c64770 Fix #2713 2015-04-27 20:24:02 +02:00
Juanjo Menent
93024830f5 -Activate const PRODUCT_USE_OLD_PATH_FOR_PHOTOS by default for old 
instances
-Update changelog for 3.7.1
 2015-04-27 20:22:03 +02:00