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

42546 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Laurent Destailleur
12c6752971 Fix: Can upload files on services. 2014-08-26 23:45:02 +02:00
braito4
f5883741bf Update fiche.php 
Proyect selection was missing
 2014-08-26 20:20:29 +02:00
Laurent Destailleur
21ff810952 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-08-26 15:24:51 +02:00
Laurent Destailleur
1e28fd3541 Fix: syntax error 2014-08-26 15:24:32 +02:00
Regis Houssin
ca7ff0ecfa Fix: error in strict mode 2014-08-26 09:50:26 +02:00
Regis Houssin
28ad819ab4 Fix: error in strict mode 2014-08-26 09:49:15 +02:00
aspangaro
b7daef10c6 Fix llx_c_type_resource when you update from a 3.6-beta 2014-08-26 04:35:22 +02:00
aspangaro
b561d48b5f Merge branch 'Upstream/3.6' 2014-08-26 04:20:46 +02:00
Cubexed
a97241f716 Fix unable to delete order line 
Calling trigger without having globalized $conf causes error and cancels delete operation, this commit adds the missing

2014-08-23 16:52:05 ERR     127.0.0.1        Interfaces::run_triggers was called with wrong parameters action=LINEORDER_SUPPLIER_DELETE object=1 user= langs= conf=
 2014-08-23 17:05:08 +02:00
Alexis Algoud
a353f816e3 FIX error sql on update ficheinter 2014-08-23 14:33:49 +02:00
Juanjo Menent
4d0301f5df Merge pull request #1844 from atm-alexis/3.5 
FIX error sql on update ficheinter
 2014-08-23 14:32:25 +02:00
Alexis Algoud
b0163fbed2 FIX error sql on update ficheinter 2014-08-22 16:17:45 +02:00
aspangaro
a2f0866c0c Merge branch 'Upstream/3.6' 2014-08-22 07:07:18 +02:00
Laurent Destailleur
8705dd4d1b Merge branch 'KreizIT-fix_1544' into 3.5 2014-08-21 23:30:04 +02:00
Laurent Destailleur
2cba55758b Merge branch 'fix_1544' of github.com:KreizIT/dolibarr into 
KreizIT-fix_1544

Conflicts:
	ChangeLog
 2014-08-21 23:29:38 +02:00
Laurent Destailleur
a32791f79d Merge pull request #1839 from aspangaro/3.6 
Fix :: Sql problem for fresh install on resource table
 2014-08-21 23:20:44 +02:00
Laurent Destailleur
8f18db8e3f Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-08-21 23:19:18 +02:00
Laurent Destailleur
d485e270b9 Fix: menu param is not inside allowed list 2014-08-21 23:19:01 +02:00
Laurent Destailleur
c21b389462 Fix: Pb with focus position with ckeditor 2014-08-21 14:17:27 +02:00
aspangaro
2f4e1f09e6 Fix :: Entries salaries into menu doesn't appears when this module is activated alone - Needed module tax at the moment 2014-08-21 06:47:24 +02:00
aspangaro
03f642e861 Merge branch 'Upstream/3.6' 2014-08-21 06:03:00 +02:00
aspangaro
2aa3995b73 Fix :: Sql problem for fresh install on resource table // Ok in migration script 2014-08-21 06:01:47 +02:00
Laurent Destailleur
ee65e42b1c The "final ref" of an object must be set only once all database actions 
are ok. So after trigger call.
If a trigger need to know new information on an object, trigger must
make a fetch on object.

Revert "Fix: define new ref before trigger"

This reverts commit cb2b6e6e40.
 2014-08-19 14:57:01 +02:00
Regis Houssin
cb2b6e6e40 Fix: define new ref before trigger 2014-08-18 20:28:58 +02:00
Regis Houssin
9fdfc740de Fix: define new ref before trigger 2014-08-18 20:25:57 +02:00
Laurent Destailleur
50eb2e2c15 Fix: backlink was wrong after deleting product or service. 2014-08-18 18:24:57 +02:00
Regis Houssin
967991f31a Fix: project builddoc trigger is used now 2014-08-18 08:36:58 +02:00
Laurent Destailleur
741c093ac9 Merge pull request #1828 from atm-maxime/3.5 
Fix : VAT and NPR rates where coming from multiprice...
 2014-08-17 23:36:30 +02:00
Laurent Destailleur
f7e0ef74d7 Bad translation 2014-08-17 20:05:48 +02:00