2
0
forked from Wavyzz/dolibarr
Commit Graph

51 Commits

Author SHA1 Message Date
Laurent Destailleur
e5a945ba5b Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	ChangeLog
	htdocs/admin/propal.php
	htdocs/compta/journal/purchasesjournal.php
	htdocs/compta/journal/sellsjournal.php
	htdocs/core/class/conf.class.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/lib/files.lib.php
	htdocs/core/modules/mailings/contacts2.modules.php
	htdocs/langs/ca_ES/admin.lang
	htdocs/langs/en_US/admin.lang
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/public/demo/index.php
2013-04-14 01:46:33 +02:00
Laurent Destailleur
c9b3193c44 Fix: Hooks with version 3.4 must match specification defined here:
http://wiki.dolibarr.org/index.php/Hooks_system
So i try a better fix that implement correctly this. To have the
moveFileUpload trigger keeping dolibarr code, it must return 0.
2013-04-12 13:18:24 +02:00
Laurent Destailleur
b678183ff2 Log 2013-04-07 21:09:57 +02:00
Laurent Destailleur
a22d39adfb Fix: Hook is a replaceadd hook. 2013-03-27 14:11:15 +01:00
Laurent Destailleur
0f1741a06b New: hooks for pdf_writelinedesc now implement the rule to overwrite or
not default code (http://wiki.dolibarr.org/index.php/Hooks_system)
2013-03-09 15:05:09 +01:00
Regis Houssin
647cbb08fb Fix: wrong EOL 2013-01-26 10:38:11 +01:00
Laurent Destailleur
a7d41d74e8 Merge remote-tracking branch 'origin/3.3' into develop 2013-01-23 18:09:05 +01:00
Laurent Destailleur
5f2af00397 Add logs to debug 2013-01-23 00:24:20 +01:00
Laurent Destailleur
d2152a8342 Restore correct code: A module decide if standard code is used or not
after running by a return code that is an int 
0=execute standard code, 1=disable standard code

To return a string to show or an array or error codes, this must be done
by setting
$actionclassinstance->results
or
$actionclassinstance->resprints
2013-01-22 18:15:51 +01:00
Laurent Destailleur
b0c1137397 Restore correct code: A module decide if standard code is used or not
after running by a return code that is an int 
0=execute standard code, 1=disable standard code

To return a string to show or an array or error codes, this must be done
by setting
$actionclassinstance->results
or
$actionclassinstance->resprints
2013-01-22 17:43:41 +01:00
Regis Houssin
910543c5b9 Fix: broken feature 2013-01-22 16:53:39 +01:00
Regis Houssin
f0361b9c4c Fix: broken feature 2013-01-22 16:51:10 +01:00
Laurent Destailleur
d11cee399a Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	COPYRIGHT
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
	htdocs/install/mysql/tables/llx_c_availability.sql
2013-01-16 15:45:17 +01:00
Laurent Destailleur
8d206fdfb0 Prepare move to other licence. For the moment all answers for licence
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
2013-01-16 15:36:08 +01:00
Laurent Destailleur
ec8b260bf6 New: Prepare 3.4 branch
New: Add hook for agenda, info and category tabs
2013-01-12 14:34:16 +01:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Regis Houssin
5740c7e694 Fix: change for a neutral email 2012-12-30 15:11:07 +01:00
Laurent Destailleur
4136c27516 RESTORE CODE WITH ID D2adaf7. The Merge daacf79 as lost more than 50
commits !
2012-12-01 15:45:05 +01:00
Laurent Destailleur
641f4b1ecc Qual: Change to unformize returns of hooks. 2012-11-26 13:26:50 +01:00
Laurent Destailleur
df3227ef7e Migrate spain to localtax type. 2012-09-16 16:56:24 +02:00
Laurent Destailleur
d02076f8f2 Strict mode war 2012-09-05 14:41:45 +02:00
Regis Houssin
315fba37fc Fix: restore broken feature (hooks) 2012-06-13 09:28:48 +02:00
Regis Houssin
93e3c3e3f3 Fix: merge array of hookmanager errors 2012-06-03 23:53:32 +02:00
Laurent Destailleur
50944a71db Checkstyle 2012-05-06 00:45:15 +02:00
Laurent Destailleur
3383d314c9 Doxygen 2012-03-19 17:18:11 +01:00
Laurent Destailleur
5f8fc30121 Fix: Avoid duplicate hooks 2012-03-15 22:37:42 +01:00
Regis Houssin
ca468c2f84 Fix: hook object more simple 2012-03-09 14:48:56 +01:00
Regis Houssin
2117cf7a6a Fix: use $context for key to avoid data corrupt
Fix: remove dao instantiation
2012-03-09 14:34:53 +01:00
Regis Houssin
9301def08d Fix: rename method 2012-03-02 15:03:14 +01:00
Regis Houssin
5b3a3b8e2e Fix: add array return 2012-03-02 17:40:16 +08:00
Laurent Destailleur
cc6a2c8d84 Fix: Compatibility of new module setup with old setup 2012-02-24 11:06:05 +01:00
Regis Houssin
1b236c5c56 Fix: possibility to add more parameters (eg: entity=0) 2012-02-24 15:53:38 +08:00
Laurent Destailleur
ef6706a6b9 New: Add hook toprightmenu 2012-02-22 12:02:12 +01:00
Regis Houssin
4ea47d221f Fix: hook problem 2012-02-07 01:35:08 +08:00
Laurent Destailleur
6cb0685b6f Qual: Uniformize hook names. All hooks to add information on
create/update/view cards are called fomrObjectOptions instead of
sometine formObjectOptions, sometimes showInputFields, sometimes
showOutputFields.
2012-02-06 17:18:19 +01:00
Laurent Destailleur
4c95c486f6 Qual: Removed hardcoded code for external module. Replaced by hook. 2011-11-01 18:36:06 +01:00
Laurent Destailleur
bc922a71c4 Fix comment 2011-10-16 01:38:40 +02:00
Laurent Destailleur
0bc80e9bec Qual: Doxygen
Qual: Uniformize some code
2011-10-14 18:51:20 +02:00
eldy
6eea1f56c9 More comments. 2011-10-05 14:29:16 +02:00
Regis Houssin
2c1b3722f2 Fix: replace sizeof() by count() 2011-09-17 19:49:50 +00:00
Regis Houssin
2ecc03104c Fix: remove obsolete tags (in progress) 2011-08-27 15:14:31 +00:00
Laurent Destailleur
273b61fc4c Removed exceptions 2011-08-21 18:34:49 +00:00
Laurent Destailleur
9689e413bf Qual: More logs 2011-08-20 17:00:34 +00:00
Regis Houssin
c0f0f52ff4 Fix: missing function return value if errors 2011-08-18 07:05:13 +00:00
Regis Houssin
e6088c098b Fix: html comments probem with pdf 2011-08-11 09:26:34 +00:00
Regis Houssin
7498df0554 Fix: works on repair broken features 2011-08-11 07:51:50 +00:00
Laurent Destailleur
acea604e54 Change signature of all call executHooks.
Now they accept all the following signature:
executeHooks('method',$parameters,$object,$action)
2011-08-10 22:47:33 +00:00
Laurent Destailleur
c3ca9083c1 Add comment 2011-08-10 19:34:44 +00:00
Regis Houssin
fb09ae37d9 Fix: works on repair broken features (in progress) 2011-08-10 17:40:42 +00:00
Regis Houssin
f9c879528d Fix: works on repair broken features (in progress) 2011-08-10 10:55:34 +00:00