Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
74,214 Commits 36 Branches 189 Tags
b69f63e7d7a6074c347e0ccd2bcabb97b9b95ca2
Commit Graph

150 Commits

Author SHA1 Message Date
Laurent Destailleur
e6e18ff616 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/menus/edit.php
	htdocs/product/stock/card.php
	htdocs/product/stock/info.php
	htdocs/product/stock/movement_list.php
 2019-02-14 15:33:17 +01:00
Laurent Destailleur
fbfb4ce566 FIX creation of new left menu entry 2019-02-14 10:10:31 +01:00
Laurent Destailleur
5c27ec5d25 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/menus/edit.php
	htdocs/compta/compta-files.php
 2019-02-13 11:21:20 +01:00
Laurent Destailleur
11f48460b2 Fix 2019-02-12 23:26:25 +01:00
Laurent Destailleur
d86017b8ff Fix create left menu entry 2019-02-12 23:21:53 +01:00
Laurent Destailleur
639dfa09aa Fix creation of left menu 2019-02-12 23:17:40 +01:00
Laurent Destailleur
1f9f335e44 FIX creation of menu entry with parent id not int 
Conflicts:
	htdocs/admin/menus/edit.php
 2019-02-12 19:11:05 +01:00
Laurent Destailleur
986fb2ae38 FIX creation of menu entry with parent id not int 2019-02-12 19:09:27 +01:00
Frédéric FRANCE
970392adb8 Merge remote-tracking branch 'upstream/develop' into psr2squizwhite 2019-02-03 22:41:57 +01:00
Frédéric FRANCE
80a12fcd1c psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent 2019-02-03 14:29:45 +01:00
Frédéric FRANCE
7ee086b402 PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Laurent Destailleur
bdb4295379 Fix menu editor 2018-12-10 18:24:05 +01:00
Laurent Destailleur
b35a9c0e64 FIX Edition of menu fails (mainmenu required for top menu) 2018-12-10 17:50:58 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Philippe GRAND
035b2be2eb Standardize and update call to langs 2018-09-07 14:58:22 +02:00
Philippe GRAND
f17275845d standardize 2018-07-28 14:29:28 +02:00
Laurent Destailleur
8184eff66c Fix for #9079 2018-07-09 15:25:14 +02:00
Laurent Destailleur
d26b2a694d FIX Security fixes (filter onload js, less verbose error message in 
download and viewimage, show info to encourage dolibarr_main_prod=1)
 2017-09-06 11:39:30 +02:00
Laurent Destailleur
68e333879f Fix var not sanitized 2017-05-16 13:27:32 +02:00
Sof
a30d4a0a38 Fix : Custom menu handler is not accessible for editing 2016-10-18 16:58:50 +02:00
Laurent Destailleur
6c5849fc87 Fix field too small 2016-08-09 15:56:39 +02:00
appchecker
4b1dfbc2fb replace intval with GETPOST 2016-07-11 12:56:05 +03:00
appchecker
9895084627 prevent SQLi 2016-07-07 20:23:38 +03:00
Laurent Destailleur
5f5328c3d8 FIX Link in menu when using left menu editor was wrong. 
FIX Updating an entry with menu editor did not save fk_leftmenu.
 2016-06-29 14:09:18 +02:00
Laurent Destailleur
b57476153f Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/admin/menus/edit.php
	htdocs/fourn/ajax/getSupplierPrices.php
	htdocs/societe/consumption.php
 2016-06-04 01:14:36 +02:00
Laurent Destailleur
c663ca13b8 Fix edit left menu 2016-06-01 21:41:47 +02:00
Laurent Destailleur
466404d968 Fix missing dol_fiche_xxx 2016-04-29 17:58:39 +02:00
Bahfir Abbes
61ef9921bd correction of precedent commit 
I do not kow how I deleted a line instead of another.
Sorry for it.
Hope it's resolved
 2015-12-27 17:50:29 +01:00
Bahfir Abbes
4f4c6d904e Update edit.php 
allow cherry-pick of a sub-menu by changing its parent identifier
 2015-12-20 13:37:46 +01:00
philippe grand
9b0dd8159e [Qual] Close database handler should be after Footer 2015-12-11 12:29:19 +01:00
Laurent Destailleur
2a345b6fc0 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/admin/company.php
	htdocs/admin/menus/edit.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/pdf.lib.php
 2015-11-21 12:48:41 +01:00
Marcos García de La Fuente
5dba9ef54e FIX #4043 Incorrect translation in error mesage in menu creation admin page 2015-11-20 22:00:11 +01:00
philippe grand
3767ab437e [Qual] Uniformize code 2015-10-23 12:58:30 +02:00
philippe grand
f31ddc23aa [Qual] Uniformize code 2015-10-17 16:18:33 +02:00
Raphaël Doursenaud
631ee83745 [Qual] Replaced deprecated print_fiche_titre() 2015-09-24 18:34:58 +02:00
Raphaël Doursenaud
e149d49fb8 [Qual] Use jQuery property instead of attribute to test and set disabled 2015-05-12 14:53:01 +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
c905f88498 Change generic and setup image title 2015-04-18 23:13:48 +02:00
Laurent Destailleur
e3713c8b6d Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/admin/tools/eaccelerator.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/dispatch.php
 2015-02-19 00:01:26 +01:00
Marcos García de La Fuente
e21681a369 PHPDoc and misc fixes for Admin 2015-02-10 10:52:48 +01:00
aspangaro
c4c69e191b Replace <center> tags 2014-11-25 20:13:43 +01:00
Laurent Destailleur
83447243ae Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	build/debian/get-orig-source.sh
	htdocs/product/class/product.class.php
	htdocs/societe/soc.php
 2014-09-15 22:58:39 +02:00
Laurent Destailleur
05f3a47018 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	build/debian/control
	htdocs/compta/bank/account.php
	htdocs/fourn/paiement/fiche.php
	htdocs/product/class/product.class.php
	htdocs/product/fiche.php
 2014-09-15 22:52:59 +02:00
Marcos García de La Fuente
74e16db632 [ bug #1589 ] Menu type in "Edit menu" page is not translated 2014-09-14 13:14:03 +02:00
Marcos García de La Fuente
434bb1bec7 Migrated old message notifications to the """new""" system 2014-07-20 00:10:40 +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
f6c2bd4928 Fix: Uniformize menu conditions 2013-04-28 23:25:28 +02:00
Laurent Destailleur
4e0ef01389 Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap 2013-04-25 01:13:13 +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
Marcos García
40a9ab9772 Added missing translations 2013-04-20 00:08:09 +02:00