Laurent Destailleur
52fefc2d02
Debug module resource
2016-06-06 13:14:05 +02:00
Laurent Destailleur
9b6e5196ea
Debug module resource. Filter on agenda.
2016-06-06 13:05:36 +02:00
Laurent Destailleur
9c3b9a8494
NEW: Link on user in leave context reach to leave tab.
2016-05-19 13:25:16 +02:00
Laurent Destailleur
d083ad9382
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/product/class/product.class.php
htdocs/resource/class/html.formresource.class.php
2016-05-17 18:21:22 +02:00
Laurent Destailleur
668df6cb7d
Debug resource module
2016-05-17 10:51:13 +02:00
Laurent Destailleur
63d0710842
FIX Creation of the second ressource type fails.
2016-05-17 10:44:30 +02:00
Ion Agorria
788d499bf6
Change resource type to dolresource in class
2016-05-11 18:50:02 +02:00
Laurent Destailleur
8fe799f424
Merge branch 'dol_resource' of https://github.com/aternatik/dolibarr
...
into aternatik-dol_resource
Conflicts:
dev/initdata/img/printcompany.png
htdocs/compta/bank/card.php
2016-04-29 17:51:11 +02:00
Sebastien Bechet
82f74ceb38
Postgresql compatibility patch + cosmetic
2016-03-22 10:09:41 +01:00
jfefe
7c4a9d140b
Replace reserved keyword "Resource" by "DolResource"
...
# Conflicts:
# htdocs/resource/list.php
2016-01-21 11:26:21 +01:00
braito4
47ee8993d3
fix travis
2015-12-28 11:47:12 +01:00
braito4
07f7717b51
Fix Warning #4229 PHP7
2015-12-28 11:28:18 +01:00
Laurent Destailleur
ba3c8de785
Update doc comment to make things cleaner to avoid confusion between old
...
deprecated doActions of canvas and doActions of triggers.
2015-12-17 14:01:22 +01:00
Laurent Destailleur
480a398f36
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/holiday/card.php
htdocs/resource/list.php
2015-12-03 13:06:20 +01:00
Frédéric FRANCE
e6033369a8
Update resource.class.php
2015-11-26 20:33:07 +01:00
Laurent Destailleur
cb3765bc92
Debug module Resource
2015-11-22 12:23:10 +01:00
Raphaël Doursenaud
67ddb6c94e
[Qual] Cleanup of inherited class properties
2015-09-24 20:12:55 +02:00
Ion Agorria
f3cd9da73d
Resource fixes
2015-08-12 21:48:00 +02:00
Raphaël Doursenaud
3f9270ea78
Qual: added deprecation hinting
...
Added deprecation hinting for class properties
Added syslog warning events for deprecated functions, methods and/or their parameters
Added hinting for some constants
2015-06-01 11:00:11 +02:00
Raphaël Doursenaud
5d2f081152
[Qual] Fixed HTML select form selected attribute
...
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The select form selected attribute should not have a value.
2015-05-07 14:21:14 +02:00
aspangaro
d69f066735
QUAL: Traduce terms + remove <center>
2015-03-15 14:04:07 +01:00
frederic34
f4161b457b
Add dol_escape_htmltag and start to adapt boxes
2015-01-22 00:23:55 +01:00
frederic34
1b0dd671b3
Add tooltip in getNomUrl link
2015-01-20 21:40:33 +01:00
Laurent Destailleur
e24a668c52
Merge pull request #2225 from frederic34/psr2
...
Psr2
2015-01-09 22:53:06 +01:00
frederic34
60661ae948
Add some "classfortooltip"
2015-01-09 00:07:54 +01:00
frederic34
73fda2cb86
WIP PSR2
2015-01-08 18:36:03 +01:00
Laurent Destailleur
0459477097
Fix: Miscellaneous fixes for multicompany
2014-12-06 14:41:56 +01:00
Laurent Destailleur
445f696d28
Fix: Pb of object with wrong type.
2014-11-15 18:24:38 +01:00
Laurent Destailleur
d98bfb1d8d
Fix: Bugs reported by scrutinizer
2014-11-15 15:19:37 +01:00
Laurent Destailleur
5e0946bdc2
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/adherents/fiche.php
htdocs/core/lib/date.lib.php
htdocs/langs/fr_FR/bills.lang
htdocs/resource/class/resource.class.php
2014-11-05 16:37:07 +01:00
aspangaro
57f49ec5d4
GPLv3
2014-10-30 20:41:08 +01:00
jfefe
e370ffb2d4
Bad function call
2014-10-30 01:33:39 +01:00
Laurent Destailleur
14ab409ca9
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/admin/stock.php
htdocs/admin/system/index.php
htdocs/comm/fiche.php
htdocs/core/lib/admin.lib.php
htdocs/core/lib/holiday.lib.php
htdocs/core/lib/pdf.lib.php
htdocs/core/login/functions_forceuser.php
htdocs/core/login/functions_http.php
htdocs/core/menus/standard/auguria.lib.php
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/filefunc.inc.php
htdocs/holiday/define_holiday.php
htdocs/opensurvey/fonctions.php
htdocs/societe/canvas/actions_card_common.class.php
test/phpunit/CompanyBankAccountTest.php
test/phpunit/ExportTest.php
test/phpunit/FactureTest.php
test/phpunit/FunctionsLibTest.php
test/phpunit/PropalTest.php
test/phpunit/SocieteTest.php
test/phpunit/WebservicesInvoicesTest.php
test/phpunit/WebservicesThirdpartyTest.php
2014-09-28 02:14:32 +02:00
Laurent Destailleur
e8b7c9c6bd
Fix: doxygen
2014-09-27 16:00:11 +02:00
Laurent Destailleur
342e26f679
Merge
2014-09-07 12:22:04 +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
6226d39cda
Fix: Pb when option javascript disabled.
2014-07-29 19:45:48 +02:00
Marcos García de La Fuente
ec661d0c6c
Removed index.php and replaced them with blank index.html as it is more appropriate
2014-07-12 23:18:57 +02:00
KreizIT
ca97c0bef3
Refactor: RESOURCE_* trigger
2014-07-11 16:06:06 +02:00
Marcos García de La Fuente
56abf1cd72
Removed duplicated SQL error logging
2014-06-13 02:28:30 +02:00
Marcos García de La Fuente
9fbd7806f0
More substitutions
2014-06-12 11:31:53 +02:00
Raphaël Doursenaud
c48c3a9d91
Qual: remove PHP closing tag (again)
...
These were reintroduced by careless merge
2014-05-26 13:51:25 +02:00
Laurent Destailleur
0027dc30f5
Fix: Modules into core should never, by definition, activate hooks
...
(hooks are architecture solution for external module)
2014-05-14 12:14:18 +02:00
jfefe
d69b7fb1dc
Fix : bad redirect after resource deleting
2014-05-11 12:42:21 +02:00
jfefe
04161084cf
Fix : missing method to delete linked resource
2014-05-11 12:26:57 +02:00
jfefe
e9453437f1
New : delete resource
2014-05-11 12:12:17 +02:00
jfefe
12aafd219d
Fix : update linked resource
2014-05-11 10:19:38 +02:00
jfefe
872b2c229e
Fix : delete linked resource on an element
2014-05-11 00:49:01 +02:00
jfefe
225c7ae07b
New : link resource with any element
...
With tpl system, external modules can declare resource with hook getElementResources
2014-05-10 22:07:54 +02:00
