Commit Graph

43796 Commits

Author SHA1 Message Date
Laurent Destailleur
a1e92b464f Merge pull request #1848 from atm-alexis/develop_feature_intervention_lines_extrafields
Feature  : Add extrafields on intervention's lines
2014-08-28 12:00:43 +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
013023204f Merge pull request #1841 from GPCsolutions/modules
Modules classes documentation enhancements
2014-08-28 11:58:13 +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
Laurent Destailleur
d43c6e57c7 Merge pull request #1843 from aspangaro/develop-patch1
Fix :: Sql problem on resource table
2014-08-28 11:44:26 +02:00
Laurent Destailleur
fbf51302dd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-08-28 11:20:32 +02:00
Laurent Destailleur
a486b4e415 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.
2014-08-28 11:20:13 +02:00
aspangaro
bb45b8bbc5 Typo & admin menu 2014-08-28 07:37:29 +02:00
aspangaro
5b3be47b47 Merge branch 'Upstream/develop' 2014-08-28 07:28:45 +02:00
aspangaro
84dff915c1 Typo 2014-08-28 07:21:40 +02:00
aspangaro
9b3a3a47c2 Add link chart of accounts in administration 2014-08-28 07:18:28 +02:00
aspangaro
6f8234dd60 Update Eldy menu 2014-08-28 07:13:33 +02:00
aspangaro
add4528e6c Update perms 2014-08-28 06:48:22 +02:00
aspangaro
d03763f6c3 Update Accounting Expert integration 2014-08-28 06:30:01 +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
Regis Houssin
76cb6f760a Fix: strict mode anarchy ;-)
check your variable please
2014-08-27 19:02:13 +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
071c405bad Fix: error with php strict mode 2014-08-27 10:47:25 +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
aspangaro
71265558d2 Integrate module Accounting Expert 2014-08-27 07:03:42 +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
Laurent Destailleur
c3fe0c1ae9 Fix: sql errors into migration scripts 2014-08-26 23:08:06 +02:00
Laurent Destailleur
4b4360af32 Fix: sql syntax errors 2014-08-26 23:02:21 +02:00
braito4
f5883741bf Update fiche.php
Proyect selection was missing
2014-08-26 20:20:29 +02:00
Juanjo Menent
a31fec1b0b Fix tab active to real tab active 2014-08-26 19:55:35 +02:00
Cubexed
00856eb277 Merge remote-tracking branch 'upstream/develop' into develop 2014-08-26 17:29:42 +02:00
Alexis Algoud
7af788729b debug extrafield on create card 2014-08-26 17:25:13 +02:00
Alexis Algoud
35fca84f19 ok on insert 2014-08-26 17:08:03 +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
Alexis Algoud
40aadc8125 add extrafield in add form 2014-08-26 12:11:34 +02:00
Alexis Algoud
85228fd8e7 add support in admin 2014-08-26 11:50:02 +02:00
Alexis Algoud
a3469f1f01 FIX bug on migration 3.6 -> 3.7 2014-08-26 11:27:57 +02:00
Regis Houssin
9dafdf41bb Fix: error in strict mode 2014-08-26 09:51:00 +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
Laurent Destailleur
d710d9f114 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-08-25 19:33:38 +02:00
Laurent Destailleur
a5deeebfdc Add try catch 2014-08-25 19:32:36 +02:00
Laurent Destailleur
7cb283d0ea Prepare code to be able to choose what to show into footer 2014-08-25 19:16:37 +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
8e6a40d475 FIX error sql on update ficheinter 2014-08-23 14:34:48 +02:00