Laurent Destailleur
|
056a503200
|
Merge branch '11.0' of https://github.com/dolibarr/dolibarr into 12.0
Conflicts:
htdocs/product/composition/card.php
|
2020-08-14 11:06:39 +02:00 |
|
stickler-ci
|
d784c621c9
|
Fixing style errors.
|
2020-08-13 15:07:06 +00:00 |
|
Adrien Raze
|
990217fcb0
|
FIX : task leftmenu
|
2020-08-13 16:59:27 +02:00 |
|
Laurent Destailleur
|
ecfdb4bbac
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
|
2020-08-02 16:02:09 +02:00 |
|
florian HENRY
|
2c5e96bb28
|
better fix
|
2020-07-20 09:01:21 +02:00 |
|
florian HENRY
|
d2e528d8c1
|
fix display Commerce top menu if user only suppler order and MAIN_MENU_HIDE_UNAUTHORIZED=1
|
2020-07-15 17:45:45 +02:00 |
|
florian HENRY
|
3148a181e7
|
fix display Commerce top menu if user only suppler order and MAIN_MENU_HIDE_UNAUTHORIZED=1
|
2020-07-15 17:45:34 +02:00 |
|
Laurent Destailleur
|
9b1163cfb8
|
Fix menu organisation.
|
2020-07-06 11:52:28 +02:00 |
|
Laurent Destailleur
|
5f2486049e
|
Fix trans
|
2020-07-01 13:22:15 +02:00 |
|
Laurent Destailleur
|
194b92e70f
|
Fix load of menu when 'perm' or 'enabled' is '0'.
|
2020-06-27 15:27:09 +02:00 |
|
Laurent Destailleur
|
81c80b254e
|
Fix lang property on database menu entry was not propagated
|
2020-06-07 19:25:25 +02:00 |
|
Laurent Destailleur
|
3883d73f20
|
Merge pull request #13970 from atm-quentin/FIX_missing_menu_accountancy_report
FIX missing accountancy report menu for simple accountancy conf
|
2020-05-28 17:51:06 +02:00 |
|
Laurent Destailleur
|
15f2165c12
|
Fix work on payment by bank transfer (avoid confusion between record)
|
2020-05-27 20:14:11 +02:00 |
|
atm-quentin
|
1c45866409
|
FIX missing accountancy report menu for simple accountancy conf
|
2020-05-26 10:33:07 +02:00 |
|
Laurent Destailleur
|
25d1a2a1d8
|
Restore missing png file
|
2020-05-25 13:36:56 +02:00 |
|
Laurent Destailleur
|
106fe7bde6
|
Clean conflict between direct debit and direct credit orders.
|
2020-05-17 15:06:09 +02:00 |
|
Laurent Destailleur
|
6c8d302dd9
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/prelevement/list.php
htdocs/compta/prelevement/rejets.php
htdocs/fourn/commande/index.php
|
2020-05-07 12:03:49 +02:00 |
|
Laurent Destailleur
|
36a0780f14
|
More complete fix for #13817
|
2020-05-05 15:20:40 +02:00 |
|
atm-lena
|
78a427c996
|
FIX wrong user right's name to top menu "commercial"
|
2020-05-05 14:35:03 +02:00 |
|
Laurent Destailleur
|
66b33573ef
|
Fix menu
|
2020-04-28 18:30:38 +02:00 |
|
Laurent Destailleur
|
a40c2fdbfc
|
Debug v12
|
2020-04-28 02:58:33 +02:00 |
|
Laurent Destailleur
|
fb8bdefbaa
|
Look and feel v12
|
2020-04-28 02:10:26 +02:00 |
|
Laurent Destailleur
|
1c70e49695
|
Merge branch 'develop' into 12.0_a23
|
2020-04-27 14:14:13 +02:00 |
|
Laurent Destailleur
|
38f2aad0c6
|
Debug asset module
|
2020-04-25 03:19:30 +02:00 |
|
Laurent Destailleur
|
5254a94038
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/ldap.php
htdocs/commande/class/commande.class.php
htdocs/commande/index.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/expedition/list.php
htdocs/fourn/commande/list.php
htdocs/fourn/facture/list.php
htdocs/loan/list.php
htdocs/product/class/product.class.php
htdocs/supplier_proposal/list.php
|
2020-04-16 15:58:59 +02:00 |
|
atm-quentin
|
f7c07640dd
|
viewstatut to search_status
|
2020-04-15 15:01:00 +02:00 |
|
Scrutinizer Auto-Fixer
|
444c293c01
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-04-10 08:59:32 +00:00 |
|
Maxime Kohlhaas
|
79e5099c6d
|
Add menu entries
|
2020-04-04 18:45:33 +02:00 |
|
Alexandre SPANGARO
|
89de39f199
|
Move supplier proposal menu to the core
|
2020-03-23 08:51:38 +01:00 |
|
Alexandre SPANGARO
|
b613769606
|
Work on split module fournisseur
|
2020-03-22 06:09:47 +01:00 |
|
Laurent Destailleur
|
1fb6d1d43d
|
FIX menu export document was not visible when using "simple accounting"
|
2020-03-08 20:49:50 +01:00 |
|
Laurent Destailleur
|
50d76ae0e8
|
FIX Bad permission to access menu Statistics on intervention.
|
2020-03-04 11:51:32 +01:00 |
|
Laurent Destailleur
|
91899d2f56
|
Fix list of opportunity with filter on search_usage_opportunity
|
2020-02-19 14:32:12 +01:00 |
|
Laurent Destailleur
|
7e814e2a08
|
FIX Menu truncated. Add tooltip to have all content.
|
2020-02-18 12:01:19 +01:00 |
|
Laurent Destailleur
|
7cb2c21dc2
|
FIX #12974
|
2020-02-02 19:50:53 +01:00 |
|
Laurent Destailleur
|
f2771b3365
|
FIX #12896
|
2020-01-25 14:23:23 +01:00 |
|
Laurent Destailleur
|
44978db027
|
FIX The substitution variable array was not complete
|
2019-12-19 13:42:13 +01:00 |
|
Laurent Destailleur
|
3cef84f26d
|
Move feature from experimental to stable
|
2019-12-19 12:34:58 +01:00 |
|
Laurent Destailleur
|
a3fa6eb473
|
Debug v11
|
2019-12-16 19:40:18 +01:00 |
|
Laurent Destailleur
|
790fdc881c
|
# WARNING: head commit changed in the meantime
Restore file for travis
|
2019-12-01 10:50:56 +01:00 |
|
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
|
b69a7f9709
|
css
|
2019-11-17 20:25:39 +01:00 |
|
Laurent Destailleur
|
86094613e8
|
Merge pull request #12428 from Dolibarr/scrutinizer-patch-4
Scrutinizer Auto-Fixes
|
2019-11-14 08:50:06 +01:00 |
|
Scrutinizer Auto-Fixer
|
b40ecc3933
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 18:37:08 +00:00 |
|
Scrutinizer Auto-Fixer
|
8a527631a0
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 18:35:02 +00:00 |
|
Laurent Destailleur
|
1f0cee2139
|
Merge pull request #12376 from TobiasSekan/FixNotDeactivatedCommercialButton
Fix not deactivated commercial menu button
|
2019-11-07 15:05:26 +01:00 |
|
Tobias Sekan
|
7dc94f1761
|
Fix not deactivated commercial menu button
|
2019-11-07 13:50:25 +01:00 |
|
Tobias Sekan
|
5de36b2bab
|
Fix main menu access for only shipment rights
|
2019-11-07 09:48:46 +01:00 |
|