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
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
cd5d3f5368
Fix :: Sql problem on resource table
2014-08-22 07:19:14 +02:00
aspangaro
a2f0866c0c
Merge branch 'Upstream/3.6'
2014-08-22 07:07:18 +02:00
Laurent Destailleur
b602b7098c
Update changelog
2014-08-22 00:09:27 +02:00
Laurent Destailleur
16204d9261
Merge pull request #1835 from GPCsolutions/optimize_images
...
Optimize images
2014-08-22 00:04:08 +02:00
Laurent Destailleur
b14a1b2ae6
Merge pull request #1832 from KreizIT/Calendar
...
Fix allday event move
2014-08-22 00:03:04 +02:00
Laurent Destailleur
137efaa1f4
Merge branch 'aspangaro-3.6-patch' into develop
2014-08-22 00:02:10 +02:00
Laurent Destailleur
e3fede595f
Removed all triggers _BUILDOC. Building a document is not a business
...
status change but a technical action. So hooks must be used instead.
Merge branch '3.6-patch' of github.com:aspangaro/dolibarr into
aspangaro-3.6-patch
Conflicts:
htdocs/core/modules/project/modules_project.php
htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
2014-08-22 00:01:53 +02:00
Laurent Destailleur
fc02f0f08f
Fix: No new inside a constructor method.
2014-08-21 23:43:11 +02:00
Laurent Destailleur
ff6368b39f
Merge pull request #1838 from GPCsolutions/triggers_globals
...
Fix: missing global declarations
2014-08-21 23:31:29 +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
04b611f758
Merge pull request #1820 from aspangaro/develop-trad1
...
Qual: Renamed table llx_c_civilite into llx_c_civility
2014-08-21 23:25:49 +02:00
Laurent Destailleur
eb3c53d897
Merge pull request #1823 from Devensys/Develop-removeVersion
...
Hidden version on login page
2014-08-21 23:24:08 +02:00
Laurent Destailleur
cb3cb1f734
Merge pull request #1837 from GPCsolutions/civility_id
...
Fix: module still using deprecated civilite_id
2014-08-21 23:21:21 +02:00
Laurent Destailleur
061a3384fc
Merge pull request #1836 from GPCsolutions/dictionaries
...
Fix: module still using deprecated dictionnaries
2014-08-21 23:21:08 +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
Raphaël Doursenaud
2c1e892efe
Enhanced boxes model documentation
2014-08-21 18:35:34 +02:00
Laurent Destailleur
c799f0f10f
Uniformize code:
...
New: Call to hook after generation is also done into odt.
Fix: Missing hook before save.
2014-08-21 15:02:18 +02:00
Laurent Destailleur
bc0c5fb55e
New: Can modify order with status approved if it was not sent yet to
...
supplier.
2014-08-21 14:24:06 +02:00
Laurent Destailleur
c21b389462
Fix: Pb with focus position with ckeditor
2014-08-21 14:17:27 +02:00
Raphaël Doursenaud
c3b30893fc
Enhanced modules parent class methods documentation
2014-08-21 12:17:13 +02:00
Raphaël Doursenaud
29ca4b7a0a
Enhanced modules parent class properties documentation
2014-08-21 12:15:15 +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
Raphaël Doursenaud
1d5fb1320b
Fix: missing global declarations
2014-08-20 19:03:58 +02:00
