Commit Graph

66 Commits

Author SHA1 Message Date
Laurent Destailleur
2c682022cf NEW The search box and the bookmarks are now rendered by the menu
manager.
2015-10-30 09:36:57 +01:00
Laurent Destailleur
ee683049a6 Enhance CSS capabilities 2015-09-22 11:24:31 +02:00
Laurent Destailleur
67b7345e83 Fix the feature to log a cheque as returned.
Fix duplicate parameter mainmenu and leftmenu into url
2015-09-12 18:00:19 +02:00
Laurent Destailleur
ac4bd7d441 Uniformize code 2015-05-04 11:41:30 +02:00
Laurent Destailleur
a32fc9efce Hide logo when option MAIN_OPTIMIZEFORTEXTBROWSER is set.
Avoid logo to overwrap box with css.
Add help text.
2015-03-24 14:08:56 +01:00
Laurent Destailleur
4fdc287717 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/accountancy/customer/card.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/admin/menus.php
	htdocs/fourn/commande/card.php
	htdocs/install/check.php
2015-01-30 15:53:06 +01:00
Laurent Destailleur
67c1ae8593 Fixed: condition to show menus 2015-01-30 15:47:27 +01:00
Laurent Destailleur
fc78d632d3 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/compta/facture.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/functions.lib.php
	htdocs/main.inc.php
2015-01-09 23:09:10 +01:00
aspangaro
f14ea7b649 Add module accountancy expert in auguria menu 2015-01-03 15:07:54 +01:00
aspangaro
c4c69e191b Replace <center> tags 2014-11-25 20:13:43 +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
5fdd798e91 Fix: phpcheckstyle from phpcs 1.5.5 (closing tags and & char on
parameter).
2014-09-27 17:13:15 +02:00
Laurent Destailleur
e8b7c9c6bd Fix: doxygen 2014-09-27 16:00:11 +02:00
aspangaro
0b20369dd7 Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00
Laurent Destailleur
90a5f6c7ef Qual: Remove end php tag. 2014-07-08 01:02:30 +02:00
Laurent Destailleur
71ca269c71 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/core/menus/standard/auguria.lib.php
	htdocs/core/menus/standard/eldy.lib.php
2014-04-25 20:29:29 +02:00
Laurent Destailleur
196cf53dbd Fix: Pb of return values 2014-04-25 20:11:38 +02:00
Raphaël Doursenaud
1c3c20105e Qual: Wrong type in method documentation 2014-04-23 18:24:02 +02:00
Raphaël Doursenaud
aa5d0b37b7 Qual: Wrong type in method documentation 2014-04-23 18:23:58 +02:00
Regis Houssin
841961df4e Fix: wrong function name 2013-08-27 14:53:24 +02:00
Laurent Destailleur
b7cada9a99 Fix: End of menu when no module selected. 2013-08-06 03:01:56 +02:00
Laurent Destailleur
0743521b6b - No need to load css of plugin fileupload (plugin never loaded). Too
much bugged to be included by default.
- Vertical menu must be under horizontal menu, even if horizontal menu
is wrapped.
- Add an empty li at end of list to provide more options for skins.
2013-07-28 05:35:51 +02:00
Laurent Destailleur
71634a0c76 Fix: Add missing css style 2013-07-23 18:36:18 +02:00
Laurent Destailleur
7c163f7be3 Fix: Running fixdosfile onto all project 2013-07-07 13:17:48 +02:00
Laurent Destailleur
7b5e0678db New: Make some changes to allow usage of alternative
$dolibarr_main_url_root variables.
Can now use several alternative path. Fix several bugs with all code.
2013-07-07 03:26:51 +02:00
Marcos García
bf2d61515d CR fix
Git required me to commit these changes
2013-06-16 21:33:05 +02:00
Laurent Destailleur
3cd303c944 Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	htdocs/core/class/extrafields.class.php
2013-06-14 19:56:07 +02:00
Laurent Destailleur
0a9cf26a32 Fix: Bad closing of div 2013-06-14 19:51:53 +02:00
Regis Houssin
c9a71439b2 Fix: EOF 2013-06-05 16:24:32 +02:00
Laurent Destailleur
de2ddc02e4 Qual: Another clean of menu management system. Removed all files
pre.inc.php
2013-04-15 13:11:29 +02:00
Laurent Destailleur
9449345395 Another step for menu management rewriting 2013-04-01 20:15:52 +02:00
Laurent Destailleur
3c37f89d2e Work on new menu managers - step x 2013-04-01 16:02:16 +02:00
Laurent Destailleur
dca3179bfe New: Support __LOGIN__ and __USERID__ on left menu entries 2013-03-30 21:29:14 +01:00
Laurent Destailleur
ef571de960 New: Support __USERID__ into menu entries 2013-03-30 20:34:13 +01:00
Laurent Destailleur
89365786a8 New: enhance tool fixdosfiles.sh
Convert DOS files to unix
2013-03-30 14:27:13 +01:00
Laurent Destailleur
8f331adff6 New: Work on men management rewrite 2013-03-29 16:16:26 +01:00
Laurent Destailleur
a890c7b3ab Fix: Option to hide if no permission instead of grey was broken. 2013-03-24 03:51:49 +01:00
Laurent Destailleur
8a487a90af New: Still working on menu manager rewrite. 2013-03-15 18:00:29 +01:00
Laurent Destailleur
9b8a8351b4 Fix: Menu hidden 2013-03-10 13:22:51 +01:00
Laurent Destailleur
c11f7dfc71 Next step for rewriting menu managers. 2013-03-05 15:42:26 +01:00
Laurent Destailleur
33feddcd32 Qual: Rewrite of menu manager. next step. 2013-02-27 21:40:43 +01:00
Laurent Destailleur
b61c576343 Qual: Still work onto menu management rewrite. 2013-02-24 21:16:36 +01:00
Laurent Destailleur
1224e79ee3 Qual: Start to clean how menu managers works. 2013-02-22 19:16:03 +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
4cf56eafa5 Qual: Removed useless param 2013-01-15 12:48:46 +01:00
Regis Houssin
9812c91aff Fix: wrong EOL !!!!!!! 2013-01-10 08:27:12 +01:00
Laurent Destailleur
b667400cc1 Fix: [ bug #618 ] External accounts can access confidential informations
(a lot)
2013-01-02 21:35:28 +01:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Laurent Destailleur
2bec26c32a Fix: Some fix into menu translation 2012-12-28 19:18:04 +01:00