Laurent Destailleur
6bf3af5d83
Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0
...
Conflicts:
htdocs/compta/tva/index.php
htdocs/core/lib/pdf.lib.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/core/tpl/objectline_view.tpl.php
htdocs/margin/productMargins.php
htdocs/margin/tabs/productMargins.php
2019-12-01 10:30:22 +01:00
Laurent Destailleur
1d564c2a39
Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0
...
Conflicts:
htdocs/core/class/notify.class.php
2019-12-01 00:58:01 +01:00
Maxime Kohlhaas
9095482113
Fix margins access + menu display
2019-11-30 14:47:48 +01:00
Laurent Destailleur
76b3668368
FIX regression with option to hide picto on top menu
2019-09-15 15:15:59 +02:00
Laurent Destailleur
d8d927547f
Fix option ACCOUNTANCY_SHOW_EXPORT_FILES_MENU
2019-08-18 19:09:53 +02:00
Laurent Destailleur
c96ad85126
Add hidden option to avoid experimental to use export files feature
2019-07-23 12:34:17 +02:00
Laurent Destailleur
e5d34de877
FIX compatibility mysql 8. rank is reserved
...
FIX Permission for BOM menu
2019-07-09 00:14:01 +02:00
Laurent Destailleur
08d5ca4ddb
Debug page to export accounting documents
2019-06-17 17:53:43 +02:00
Laurent Destailleur
2fab35c287
Debug page to export file
2019-06-17 17:20:22 +02:00
Laurent Destailleur
cf82587504
Fix menu entry
2019-06-17 15:02:44 +02:00
Laurent Destailleur
29d9983669
Fix look and feel v10
2019-06-04 01:22:26 +02:00
Laurent Destailleur
3c1b860da4
Fix css
2019-05-20 12:16:39 +02:00
Laurent Destailleur
2bbb04085e
Merge branch '9.0' of https://github.com/dolibarr/dolibarr into develop
...
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
htdocs/modulebuilder/template/class/myobject.class.php
2019-05-19 02:15:01 +02:00
Maxime Kohlhaas
4f64250ad6
Fix menu links for holidays
2019-05-18 17:12:25 +02:00
Regis Houssin
449117ba52
FIX missing service
2019-05-10 15:53:49 +02:00
Regis Houssin
97de84d1e7
FIX wrong permissions in products/services menu
2019-05-10 15:48:48 +02:00
Alexandre SPANGARO
a386f0e9ea
Fix Eldy menu
2019-05-07 09:18:27 +02:00
Alexandre SPANGARO
2c411310bc
FIX Menu Accountancy (Simple) not accessible without module Accountancy (Double entries)
2019-04-25 08:29:43 +02:00
Laurent Destailleur
8d0825910a
Fix warnings
2019-04-23 10:38:20 +02:00
Alexandre SPANGARO
3729e32368
Assets - Debug - Look & field v10
2019-04-18 14:13:48 +02:00
Laurent Destailleur
7120078b0f
NEW Simplification of styles architcture: Showing or not the menuhider
...
is completely decided by CSS and screen size instead of PHP+CSS.
2019-04-03 13:26:50 +02:00
Laurent Destailleur
1b558d70c1
Fix menu translation
2019-03-22 12:42:23 +01:00
Laurent Destailleur
7f23a396a9
Merge pull request #10794 from aspangaro/10.0_AccountancyMenuV2
...
NEW: Accounting - More comprehensive menu
2019-03-14 14:29:01 +01:00
Laurent Destailleur
fe6b682ec0
NEW Add visibility with value 4 in framework to define fields to show on
...
forms and list but not on creation forms.
2019-03-12 17:45:19 +01:00
Laurent Destailleur
c6a269e4c4
Fix select of menu entry
2019-03-11 19:53:27 +01:00
Alexandre SPANGARO
4de4f2ec6f
Correct language
2019-03-10 21:03:51 +01:00
Alexandre SPANGARO
5d06e53f1b
NEW: Accounting - More comprehensive menu
2019-03-08 09:11:56 +01:00
Frédéric FRANCE
9e6a5a0b81
Update eldy.lib.php
2019-03-06 18:49:03 +01:00
Frédéric FRANCE
c2070190f2
phpcs fix
2019-03-06 16:51:35 +01:00
Laurent Destailleur
d4409ffb08
Restore menu MRP on new eldy code
2019-03-06 14:18:58 +01:00
Laurent Destailleur
df180a7682
Merge pull request #10451 from wdammak/patch-25
...
Update eldy.lib.php
2019-03-06 13:59:16 +01:00
Laurent Destailleur
1c775b7b68
Work of BOM module
2019-03-04 12:46:07 +01:00
Frédéric FRANCE
92c5c15033
add visibility
2019-02-28 20:48:07 +01:00
Laurent Destailleur
7618a7348f
Merge branch 'develop' into 10.0_accountancy2
2019-02-27 01:51:01 +01:00
Laurent Destailleur
9e82c37963
WIP Start module BOM
2019-02-26 19:27:04 +01:00
Laurent Destailleur
c204b8bf7b
Fix menu level
2019-02-20 05:17:24 +01:00
Laurent Destailleur
4296f959ca
Invert option MAIN_HIDE_VERSION into ! MAIN_SHOW_VERSION
...
Reorganize levels of menu accountancy
2019-02-20 04:55:35 +01:00
AXeL-dev
b9749ae81c
add missing submenus for supplier orders list in auguria menu
2019-02-18 18:46:38 +01:00
Alexandre SPANGARO
49a975beb3
Update works
2019-02-18 07:14:21 +01:00
Alexandre SPANGARO
849299cdb6
FIX: Accountancy journal label menu on Auguria
2019-02-13 11:52:31 +01:00
Frédéric FRANCE
bd8d81a96e
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-02-02 07:49:41 +01:00
Laurent Destailleur
9d03f4b228
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-02-01 18:17:02 +01:00
Laurent Destailleur
a2ab6348ed
Fix bad menu leading on a development page
2019-02-01 17:06:34 +01:00
Laurent Destailleur
e18bd6f986
Merge branch 'develop' into nospaceaftercomma
2019-01-30 18:27:35 +01:00
Laurent Destailleur
e72d6c50e6
Merge pull request #10428 from frederic34/toomanylines
...
PSR2.Files.EndFileNewline.TooMany
2019-01-30 16:17:09 +01:00
wdammak
84d2bcce4f
Update eldy.lib.php
...
Fix Travis
2019-01-29 22:08:18 +01:00
wdammak
f3c725f40f
Update eldy.lib.php
...
fix travis
2019-01-29 21:36:52 +01:00
wdammak
c18a8bef1b
Update eldy.lib.php
...
Simplifying horizontal menu writing, it would simplify menu updates in the future.
The menu table can be further simplified, it's in a 2nd step if @eldy confirms this restructuring.
Already tested and it works.
2019-01-29 19:44:59 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-27 23:23:38 +01:00
Laurent Destailleur
ecc30b8ffe
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
2019-01-27 18:27:58 +01:00