lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
51,489 Commits 43 Branches 150 Tags 886 MiB
90833e5d0e
Commit Graph

51489 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
90833e5d0e Merge pull request #4411 from atm-ph/fix_develop_situation_invoice 
FIX invoice situation
 2016-01-13 15:10:16 +01:00
phf
a50a7366cb FIX travis test 2016-01-13 14:04:48 +01:00
phf
d213fbae08 FIX invoice situation 2016-01-13 13:42:58 +01:00
Laurent Destailleur
7fd2cbea49 Merge pull request #4257 from defrance/patch-91 
add icalname on default event
 2016-01-12 23:41:57 +01:00
Laurent Destailleur
97e96bed87 Merge pull request #4360 from GPCsolutions/develop-morelock 
[Security] Detect lockfile even without configuration
 2016-01-12 23:24:34 +01:00
Laurent Destailleur
3b60465f7b Merge pull request #4403 from frederic34/patch-7 
Add number of records in expedition list
 2016-01-12 23:19:28 +01:00
Laurent Destailleur
0a255decf8 Merge pull request #4401 from aspangaro/develop-p2 
New: #3292 Make sure each and every page displays a title
 2016-01-12 23:19:17 +01:00
Laurent Destailleur
381eea0dbf Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/menus/init_menu_auguria.sql
	htdocs/core/menus/standard/eldy.lib.php
 2016-01-12 23:10:25 +01:00
Laurent Destailleur
0f53c49673 Merge pull request #4392 from aspangaro/3.9-p5 
Fix: HRM index typo and presentation
 2016-01-12 23:00:06 +01:00
Laurent Destailleur
233dc051a1 Merge pull request #4384 from hregis/3.9_bug 
Fix: Gives the possibility to the module, to provide his own family info
 2016-01-12 22:59:43 +01:00
Laurent Destailleur
cd2695d1f5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-01-12 22:54:32 +01:00
Laurent Destailleur
bf19ae878b Add migration to 4.0 2016-01-12 22:54:20 +01:00
Laurent Destailleur
64026c41f8 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-01-12 22:03:34 +01:00
Laurent Destailleur
d7fdcc83bb Fix missing search criteria 2016-01-12 22:03:19 +01:00
Frédéric FRANCE
6a094a6b77 Update list.php 2016-01-12 08:41:25 +01:00
aspangaro
cf6be40922 New: #3292 Make sure each and every page displays a title 2016-01-11 22:03:26 +01:00
Raphaël Doursenaud
4d8a9abdbc [Security] Detect lockfile even without configuration 2016-01-11 11:10:04 +01:00
aspangaro
880a794acd Merge remote-tracking branch 'Upstream/3.9' into 3.9-p5 2016-01-10 19:54:38 +01:00
Laurent Destailleur
bf09800540 Fix function signature 2016-01-10 18:52:26 +01:00
Laurent Destailleur
68ef5ef5a8 Merge pull request #4388 from aspangaro/3.9-p5 
Fix: HRM index - typo and presentation
 2016-01-10 18:21:32 +01:00
aspangaro
47f63172e3 Fix: HRM index typo and presentation 2016-01-10 14:58:54 +01:00
Regis Houssin
694530bfae Fix: Gives the possibility to the module, to provide his own family info 
and position of this family. (canceled $this->family)
 2016-01-10 13:00:48 +01:00
Laurent Destailleur
7e9ee6f047 Fix include error 2016-01-10 12:51:42 +01:00
Laurent Destailleur
99eec6b32c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-01-10 12:38:07 +01:00
Laurent Destailleur
6648ef0064 Fix missing include 2016-01-10 12:37:56 +01:00
Laurent Destailleur
cc4c5873e6 Fix sql error 2016-01-10 12:37:48 +01:00
Laurent Destailleur
e9e081bc37 Merge pull request #4292 from bafbes/patch-13 
Include local constants files and fetch their values to the correspon…
 2016-01-10 12:03:40 +01:00
Laurent Destailleur
59765f81c5 Prepare 4.0 dev 2016-01-10 11:59:21 +01:00
Laurent Destailleur
3f7d6a95f4 Prepare 4.0 dev 2016-01-10 11:57:40 +01:00
Laurent Destailleur
f3c83fba59 Merge pull request #4201 from GPCsolutions/dolibarr-composer 
Composer updates
 2016-01-10 11:56:47 +01:00
Laurent Destailleur
6684bdce84 Merge pull request #4349 from benlo06/fr_4347 
CLOSE #4347 Add payment label to invoices csv exports
 2016-01-10 11:47:25 +01:00
Laurent Destailleur
70ffcfea33 Merge pull request #4380 from aspangaro/3.9-p4 
Fix: Donation some problems with french article
 2016-01-10 11:46:12 +01:00
Laurent Destailleur
d8001a8e7a Merge pull request #4379 from aspangaro/3.9-p3 
Fix: SQL error on user bank tab
 2016-01-10 11:45:40 +01:00
Laurent Destailleur
ffe80a36e1 Merge pull request #4378 from aspangaro/3.9-p1 
Fix: Add missing key language for propal
 2016-01-10 11:43:54 +01:00
Laurent Destailleur
c22bc8a29e Merge pull request #4377 from aspangaro/3.9-p2 
Fix: Wrong language file for 2 menu entries in accountancy module
 2016-01-10 11:38:21 +01:00
Laurent Destailleur
c07cb5a72e Merge pull request #4371 from frederic34/patch-7 
Always show remove button and why we can't remove
 2016-01-10 11:37:56 +01:00
Laurent Destailleur
2739fdcc2d Merge pull request #4367 from benlo06/fr_4366 
CLOSE #4366 Add hook for use custom ticket template
 2016-01-10 11:36:29 +01:00
Laurent Destailleur
aa0b002119 Fix #4354 2016-01-10 11:35:06 +01:00
Laurent Destailleur
fddd02eecc Complete fix #4354 2016-01-10 11:31:22 +01:00
aspangaro
965a96784c Fix: Donation some problems with french article 2016-01-10 07:35:00 +01:00
aspangaro
87f1e55bcb Fix: SQL error on user bank tab 2016-01-10 07:08:49 +01:00
aspangaro
af9e46d179 Fix: Wrong language file for 2 menu entries in accountancy module 2016-01-10 06:56:20 +01:00
aspangaro
e82f7761bc Merge remote-tracking branch 'Upstream/3.9' into 3.9-p1 2016-01-10 06:26:42 +01:00
Laurent Destailleur
8653e7fa5c Merge remote-tracking branch 'origin/3.9' into develop 2016-01-10 00:12:51 +01:00
Laurent Destailleur
2764fb240f Fix text color for category tags 
Fix banner for category translation tab
 2016-01-10 00:11:49 +01:00
Juanjo Menent
799546303b Merge pull request #4373 from simnandez/develop 
Fix: Move table interventions modify from 3.9 to 4.0
 2016-01-09 18:20:52 +01:00
Juanjo Menent
9c0b6ff5a4 Fix: Move table interventions modify from 3.9 to 4.0 2016-01-09 18:08:55 +01:00
Juanjo Menent
c47e18b7e2 Merge pull request #4197 from atm-ph/new_mail_input_file_multiple 
NEW hidden conf to use input file multiple from mail form
 2016-01-09 17:57:50 +01:00
Juanjo Menent
66c5d7c9ce Merge pull request #4150 from defrance/patch-84 
Add date start and end of intervention
 2016-01-09 17:56:39 +01:00
Juanjo Menent
c7ae943e57 Merge pull request #4311 from FHenry/develop 
NEW : if nb total of lines provided in print barre_liste, display beside title
 2016-01-09 17:52:05 +01:00