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
Raphaël Doursenaud
9f02bc78a7
Fix: module still using deprecated civilite_id
2014-08-20 10:54:35 +02:00
Raphaël Doursenaud
820ae82088
Fix: module still using deprecated dictionnaries
2014-08-20 10:46:09 +02:00
aspangaro
0f7e09d01f
Merge branch 'Upstream/develop'
2014-08-20 07:54:33 +02:00
aspangaro
af92eb3725
Problem of merging
2014-08-20 07:49:53 +02:00
Laurent Destailleur
86d91ff698
Fix: Setting new property of object must be done only after all database
...
actions are ok (and if ok).
2014-08-19 15:03:55 +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
Laurent Destailleur
a220634d30
Revert "Fix: define new ref before trigger"
...
This reverts commit 6ab41766c8
2014-08-19 14:53:30 +02:00
Laurent Destailleur
a26a7cedf8
Qual: Uniformize code. Trigger PROJECT_BUILDDOC is removed because
...
building a doc is not a business event. For technical action after
creation of a pdf, hook "afterPDFCreation" must be used instead.
2014-08-19 14:51:10 +02:00
Laurent Destailleur
30d4a7fadc
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-08-19 14:40:57 +02:00
Laurent Destailleur
7437eb8088
New: On contact list can set filter on both active and not active (no
...
more exclusive select).
2014-08-19 14:40:20 +02:00
Raphaël Doursenaud
3b8fefdb2a
Optimized theme images
2014-08-19 12:39:25 +02:00
Raphaël Doursenaud
d4414bc0f2
Added dev script for optimizing images
2014-08-19 12:38:50 +02:00
Cubexed
ecd90ddbff
Enables the fetching and saving of start and end dates in supplier order lines.
2014-08-18 23:02:04 +02:00
Regis Houssin
6ab41766c8
Fix: define new ref before trigger
2014-08-18 20:34:55 +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
aspangaro
f774ff487b
Merge branch 'Upstream/develop'
2014-08-18 11:56:49 +02:00
KreizIT
8d13ab0d4b
Fix allday event move
2014-08-18 10:27:35 +02:00
