Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
47,690 Commits 36 Branches 189 Tags
05a7ab158b51a05dbb38ac7b02abf0d2c1df9891
Commit Graph

62 Commits

Author SHA1 Message Date
aspangaro
58e942681d NEW Forms are using the tab look, even in creation mode 2015-05-20 07:03:17 +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
jfefe
f2e19f2326 Fix: error when deleting resource 2015-04-18 18:07:59 +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
e220ce5a82 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/comm/card.php
	htdocs/comm/propal.php
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/class/html.formcompany.class.php
	htdocs/custom/.gitignore
	htdocs/expedition/card.php
	htdocs/fourn/card.php
	htdocs/product/fournisseurs.php
 2015-01-18 18:44:22 +01:00
Laurent Destailleur
5c5ff72ecd Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/adherents/fiche.php
	htdocs/comm/fiche.php
	htdocs/comm/mailing/fiche.php
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/compta/paiement.php
	htdocs/core/class/html.formcompany.class.php
	htdocs/core/tpl/login.tpl.php
	htdocs/expedition/fiche.php
	htdocs/fourn/commande/fiche.php
	htdocs/fourn/facture/fiche.php
	htdocs/fourn/facture/paiement.php
	htdocs/fourn/fiche.php
	htdocs/main.inc.php
	htdocs/product/fournisseurs.php
	htdocs/resource/card.php
 2015-01-18 17:13:42 +01:00
Marcos García de La Fuente
7f59cf9194 Fix: [ bug #1787 ] Incorrect behaviour of doActions hook 2015-01-17 19:28:27 +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
aspangaro
aa8c165f06 Presentation 2014-11-23 21:03:34 +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
a99bd1c835 Fix: Fix permission on files. 2014-10-17 15:30:38 +02:00
Regis Houssin
a2446e51db New: add context "globalcard" for declaring only once all cards 2014-10-06 07:20:58 +02:00
Laurent Destailleur
ec95aacd52 Uniformize code for error reporting after a hook. 2014-09-28 03:41:32 +02: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
e7dfdd27b1 Fix: filter on POST value too restrictive 2014-05-11 12:33:49 +02:00
jfefe
8cba0fbcbe Remove reference to external module 2014-05-11 12:33:20 +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
ba1fc07037 Uniformize langage files 2014-05-11 00:38:03 +02:00
jfefe
e6bcf7c408 Missing langage file 2014-05-11 00:27:09 +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
Jean-François Ferry
8f3940aab6 Use fetch_all() method into element resource list 2014-05-10 22:07:54 +02:00
Jean-François Ferry
a76fef5f35 Work on resource list / navbar into card 2014-05-10 22:07:13 +02:00
Jean-François Ferry
c2081b299f Missing resource type select list into add form 2014-05-10 22:07:13 +02:00
Jean-François Ferry
e4962e9efd Add resource card 2014-05-10 22:07:13 +02:00
Jean-François Ferry
6a9bf009f2 Clean code 2014-05-10 22:07:13 +02:00
Jean-François Ferry
5f74b86b18 Add dictionary to define type of resources 2014-05-10 22:07:12 +02:00