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

42523 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian HENRY
b04eae95e5 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-09-03 11:44:37 +02:00
Laurent Destailleur
165856656a Fix: balance with td 2014-09-02 19:45:50 +02:00
Laurent Destailleur
f7c48558e6 Fix: balance with td 2014-09-02 19:45:05 +02:00
Laurent Destailleur
80968bc087 Merge pull request #1857 from aternatik/resource-fix 
Fixes for resource module
 2014-09-02 19:35:06 +02:00
Laurent Destailleur
257d7c41d6 Merge pull request #1863 from FHenry/3.6 
Fix: list event view lost type event filter
 2014-09-02 19:34:17 +02:00
Laurent Destailleur
0bc511a626 Merge pull request #1850 from braito4/patch-1 
Update fiche.php
 2014-09-02 19:12:09 +02:00
Laurent Destailleur
17dec4b924 Fix: Bad merge 2014-09-02 13:05:03 +02:00
Laurent Destailleur
e82e26c6fa Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	ChangeLog
	htdocs/compta/facture.php
	htdocs/core/js/lib_head.js
 2014-09-02 12:57:33 +02:00
Florian HENRY
9b40cc9e89 fix 2014-09-02 12:09:43 +02:00
Florian HENRY
832d1b37c1 Save also code of event 2014-09-02 11:32:38 +02:00
Florian HENRY
0dd955875c Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-09-02 11:21:03 +02:00
Florian HENRY
c8a9f4600c Fix: list event view lost type event filter 2014-09-02 11:20:57 +02:00
Juanjo Menent
2d0f353529 Merge pull request #1859 from FHenry/3.6 
Fix SQL syntax
 2014-09-01 22:26:21 +02:00
Florian HENRY
e2fac5dd91 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 
Conflicts:
	ChangeLog
 2014-09-01 19:10:18 +02:00
Florian HENRY
772acd6bf9 Fix missing $user in create method 2014-09-01 18:32:36 +02:00
Juanjo Menent
1f0653dd6d Merge pull request #1860 from FHenry/3.5 
Fix missing $user in create method
 2014-09-01 18:31:22 +02:00
Juanjo Menent
4372c58714 Fix: Unsubscribe emailing not working 2014-09-01 18:24:25 +02:00
Florian HENRY
db1c97bdad changelog 2014-09-01 11:52:20 +02:00
Florian HENRY
0473bc5138 Fix missing $user into create call categorie 2014-09-01 11:51:16 +02:00
Florian HENRY
bff33166a5 Fix missing $user in create method 2014-09-01 11:49:44 +02:00
Florian HENRY
fd03f582c9 Fix SQL syntax 2014-08-31 12:38:33 +02:00
Laurent Destailleur
20475ba3e8 Fix: sql request not compatible with pgsql 
Conflicts:
	htdocs/core/ajax/ziptown.php
 2014-08-30 20:19:27 +02:00
Laurent Destailleur
2d14e53b45 Fix: Pb with pgsql 2014-08-30 20:00:42 +02:00
jfefe
b7a2e3783e Fix : missing translations 2014-08-30 11:11:51 +02:00
jfefe
71afc4adb0 Fix : missing actions for resource element 2014-08-30 11:11:32 +02:00
jfefe
2c68317864 Fix : bad sql request when linking resource to an element 2014-08-30 10:23:58 +02:00
Laurent Destailleur
47339d0e62 Fix: Missing field tobuy into service export. 
Fix: Filter on date into export.
Fix: Tooltip help.
 2014-08-29 20:26:27 +02:00
Laurent Destailleur
47fc72a001 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-08-29 11:18:36 +02:00
Laurent Destailleur
a518a7256c maj copyright 2014-08-29 11:17:38 +02:00
Regis Houssin
ff04729a07 Fix: strict mode 2014-08-28 19:38:18 +02:00
Regis Houssin
1aad1b6acd Fix: strict mode 2014-08-28 19:32:41 +02:00
Regis Houssin
48f9ef2574 Fix: php strict mode saga 2014-08-28 15:53:29 +02:00
Regis Houssin
2c46c20dfb Fix: php strict mode saga 2014-08-28 15:52:58 +02:00
Regis Houssin
714da05034 Fix: another strict mode alert 2014-08-28 15:36:22 +02:00
Regis Houssin
4fdd98c4a7 Fix: another strict mode alert 2014-08-28 15:34:50 +02:00
Juanjo Menent
0e1f22fe26 Fix: Salary payments are not reflected on the reporting sheets 2014-08-28 15:16:14 +02:00
Laurent Destailleur
1505ade3db Fix error management: When an error is returned by hooks into 
dol_move_uploaded_file, message must be returned by function as if it
were an error for any other reason.

Conflicts:
	htdocs/core/lib/files.lib.php
 2014-08-28 15:14:06 +02:00
Laurent Destailleur
d3a3e8786e Fix: sql request with pgsql 2014-08-28 15:08:24 +02:00
Laurent Destailleur
79b081a7b7 Merge pull request #1845 from Cubexed/patch-1 
Fix unable to delete order line
 2014-08-28 12:00:21 +02:00
Laurent Destailleur
3064aa2177 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 
Conflicts:
	htdocs/install/mysql/tables/llx_c_type_resource.key.sql
 2014-08-28 11:56:19 +02:00
Laurent Destailleur
f1993e719f Merge pull request #1846 from aspangaro/3.6 
Fix :: llx_c_type_resource when you update from a 3.6-beta
 2014-08-28 11:55:18 +02:00
Laurent Destailleur
14ec2cd1d9 Merge pull request #1851 from grandoc/3.6 
fix : missing translation
 2014-08-28 11:53:00 +02:00
Laurent Destailleur
338fc5f2f8 Fix: Bad unique key 2014-08-28 11:46:47 +02:00
Regis Houssin
a446318649 Fix: strict mode anarchy ;-) 
check your variable please
 2014-08-27 19:03:32 +02:00
Regis Houssin
34561906fc Fix: strict mode anarchy ;-) 
check your variable please
 2014-08-27 19:03:01 +02:00
Philippe GRAND
08c621037c fix : missing code for extrafields 2014-08-27 11:41:18 +02:00
Philippe GRAND
61ae2f3f37 fix : missing translation 2014-08-27 11:34:24 +02:00
Regis Houssin
0674667932 Fix: error with php strict mode 2014-08-27 10:46:42 +02:00
Regis Houssin
cdd716eb9d Fix: error with php strict mode 2014-08-27 10:44:40 +02:00
Laurent Destailleur
4405f17f22 Update changelog 2014-08-26 23:47:44 +02:00