Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
47,786 Commits 36 Branches 189 Tags
061e675b51abc72e9ecfcaaca69d46d5e64df3b4
Commit Graph

90 Commits

Author SHA1 Message Date
Laurent Destailleur
65c7ab7a93 Fix: Introduce error by default when function is used as a true delete 
function.
 2015-05-29 17:11:42 +02:00
Laurent Destailleur
a93ba86ce0 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/modules/expedition/modules_expedition.php
	htdocs/core/modules/modContrat.class.php
	htdocs/expedition/class/expedition.class.php
 2015-05-07 13:35:09 +02:00
Laurent Destailleur
cc5968fbd5 A more complete error message 2015-05-07 10:45:35 +02:00
Laurent Destailleur
ae103e34b8 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	build/debian/changelog
	htdocs/compta/facture.php
	htdocs/core/lib/price.lib.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/opensurvey/public/studs.php
	htdocs/projet/element.php
 2015-04-13 13:08:46 +02:00
Laurent Destailleur
1272b03e5e Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	build/debian/changelog
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/fourn/facture/fiche.php
	htdocs/product/stock/mouvement.php
	htdocs/projet/element.php
	htdocs/societe/rib.php
	htdocs/theme/bureau2crea/img/statut4.png
 2015-04-12 12:03:59 +02:00
Laurent Destailleur
fd8d09c8c0 Fix avoid warning 2015-03-29 17:53:05 +02:00
Laurent Destailleur
ba2c0a2651 Clean code of hooks. 
Extrafield index on fk_object must be unique.
 2015-03-13 20:27:54 +01:00
philippe grand
96e6c66365 better translation and typo 2015-01-01 11:24:00 +01:00
Laurent Destailleur
ef5035b349 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/product/liste.php
 2014-12-18 11:42:55 +01:00
Laurent Destailleur
2c01a46774 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
	htdocs/paypal/lib/paypal.lib.php
 2014-12-18 10:13:25 +01:00
Christophe Battarel
a1bba472a0 FIX: hook insertExtraFields must return a returnvalue (0,1,-1) 2014-12-12 11:57:20 +01:00
Laurent Destailleur
a2d23fd699 Fix: Error management of hook was duplicating errors. 2014-10-18 00:33:30 +02:00
Laurent Destailleur
bb852592e6 Fix: Restore broken feature. One hook = One call of function per module. 2014-10-05 04:49:46 +02:00
Laurent Destailleur
e7a9447d94 Add hook formatEvent and fix bug into per user view. 2014-10-03 15:58:08 +02:00
Regis Houssin
3d82f0965e Fix: Try to filter by context, use the test with $currentcontext in 
method for avoid to run twice (I have not found any other solution!)
 2014-09-29 15:20:54 +02:00
Regis Houssin
c5a7dfbabb Fix: Add current context for avoid method execution in bad context, you 
can add this test in your method : eg if($currentcontext != 'formfile')
return;
 2014-09-29 14:40:02 +02:00
Laurent Destailleur
e8b7c9c6bd Fix: doxygen 2014-09-27 16:00:11 +02:00
Raphaël Doursenaud
f8f502d013 Removed closing php tag 
http://php.net/manual/en/language.basic-syntax.phptags.php
 2014-05-03 18:18:44 +02:00
Laurent Destailleur
ce34c01b9e New: On page to enter supplier prices, if there is no supplier, add 
direct link to create one.
Qual: The following hooks are now 'addreplace'
hooks: "formCreateThirdpartyOptions" so check that return value is 0 to
keep default standard behaviour after hook or 1 to disable default
standard behaviour.
 2014-04-16 00:06:16 +02:00
Laurent Destailleur
8d916215cc New: Add new hook function addMoreActionsButtons to allow a module to 
add/replace action buttons into an element.
 2014-01-24 12:51:01 +01:00
Laurent Destailleur
c147fc6016 Fix: checkstyle 
Try phpcs into travis
 2013-09-10 02:09:55 +02:00
Laurent Destailleur
ad6bd5047f Add error log to warn when module does not match specifications. 2013-07-28 14:42:50 +02:00
Laurent Destailleur
ed52dd9636 New: A more responsive desgin for statistic box of home page 
Qual: Hook for statistics now match specifications.
 2013-07-19 15:29:40 +02:00
Laurent Destailleur
b5820315f9 Fix: Correct permissions on files 2013-07-13 10:34:19 +02:00
Laurent Destailleur
7ee23a9612 Merge pull request #1085 from csalvador/form_attach_new_file_hook 
hook in form_attach_new_file(html.formfile.class.php)
 2013-07-10 06:42:37 -07:00
Cédric Salvador
9619b09e37 rewriting to fit the new way to use hooks 2013-07-10 15:30:49 +02:00
Laurent Destailleur
f67e52f42a Start to clean hook code 2013-07-09 21:40:45 +02:00
Laurent Destailleur
1bff25bf28 Start to clean hookmanager code. 2013-07-09 21:33:45 +02:00
Laurent Destailleur
93c71d00f7 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/comm/mailing/cibles.php
	htdocs/core/class/hookmanager.class.php
 2013-06-12 22:17:15 +02:00
Laurent Destailleur
a50cd7b698 Fix bug into script that fix CRLF into LF 2013-06-12 11:59:55 +02:00
Laurent Destailleur
897d1251c8 Fix: Better fix for cleaning vars (i'm tired today) 2013-06-11 12:10:02 +02:00
Laurent Destailleur
40cd45c166 Fix: Better fix for cleaning vars 2013-06-11 12:01:12 +02:00
Laurent Destailleur
8f3ba0dacc Fix: Better fix for cleaning vars 2013-06-11 11:49:59 +02:00
Laurent Destailleur
4326bfb606 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/langs/tr_TR/admin.lang
	htdocs/langs/tr_TR/agenda.lang
	htdocs/langs/tr_TR/banks.lang
	htdocs/langs/tr_TR/bills.lang
	htdocs/langs/tr_TR/bookmarks.lang
	htdocs/langs/tr_TR/boxes.lang
	htdocs/langs/tr_TR/cashdesk.lang
	htdocs/langs/tr_TR/categories.lang
	htdocs/langs/tr_TR/commercial.lang
	htdocs/langs/tr_TR/companies.lang
	htdocs/langs/tr_TR/compta.lang
	htdocs/langs/tr_TR/contracts.lang
	htdocs/langs/tr_TR/deliveries.lang
	htdocs/langs/tr_TR/dict.lang
	htdocs/langs/tr_TR/donations.lang
	htdocs/langs/tr_TR/ecm.lang
	htdocs/langs/tr_TR/errors.lang
	htdocs/langs/tr_TR/exports.lang
	htdocs/langs/tr_TR/externalsite.lang
	htdocs/langs/tr_TR/ftp.lang
	htdocs/langs/tr_TR/help.lang
	htdocs/langs/tr_TR/holiday.lang
	htdocs/langs/tr_TR/install.lang
	htdocs/langs/tr_TR/interventions.lang
	htdocs/langs/tr_TR/languages.lang
	htdocs/langs/tr_TR/ldap.lang
	htdocs/langs/tr_TR/mailmanspip.lang
	htdocs/langs/tr_TR/mails.lang
	htdocs/langs/tr_TR/main.lang
	htdocs/langs/tr_TR/margins.lang
	htdocs/langs/tr_TR/members.lang
	htdocs/langs/tr_TR/orders.lang
	htdocs/langs/tr_TR/oscommerce.lang
	htdocs/langs/tr_TR/other.lang
	htdocs/langs/tr_TR/paybox.lang
	htdocs/langs/tr_TR/paypal.lang
	htdocs/langs/tr_TR/products.lang
	htdocs/langs/tr_TR/projects.lang
	htdocs/langs/tr_TR/propal.lang
	htdocs/langs/tr_TR/sendings.lang
	htdocs/langs/tr_TR/shop.lang
	htdocs/langs/tr_TR/sms.lang
	htdocs/langs/tr_TR/stocks.lang
	htdocs/langs/tr_TR/suppliers.lang
	htdocs/langs/tr_TR/trips.lang
	htdocs/langs/tr_TR/users.lang
	htdocs/langs/tr_TR/withdrawals.lang
	htdocs/langs/tr_TR/workflow.lang
 2013-06-11 10:43:36 +02:00
Laurent Destailleur
5f9f709a70 Fix: vars must be cleaned for next call 2013-06-11 10:21:28 +02:00
Regis Houssin
c9a71439b2 Fix: EOF 2013-06-05 16:24:32 +02:00
Laurent Destailleur
52952c6fce Uniformize code for liste_array 
Fix visibility of elements into product page (manage external users)
 2013-04-27 15:08:35 +02:00
Laurent Destailleur
89ad634230 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/hookmanager.class.php
	htdocs/langs/fr_FR/holiday.lang
 2013-04-22 01:39:49 +02:00
unknown
8030b39536 fix : undefined variable 2013-04-19 19:45:06 +02:00
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