lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
109,623 Commits 43 Branches 150 Tags 886 MiB
develop
Commit Graph

1155 Commits

Author SHA1 Message Date
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
Alexandre SPANGARO
c664a1e42d Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2019-12-31 08:34:37 +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
Laurent Destailleur
204475efb9 Removed deprecated file 2019-11-05 19:10:29 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Frédéric FRANCE
8f6d38ee82
clean indent 2019-10-27 17:01:23 +01:00
Frédéric FRANCE
86f22c4563
do not ignore lines with mix od tabs and spaces 2019-10-20 17:17:22 +02:00
Laurent Destailleur
87ec1de78e Start to work on solution to sort permissions by module 2019-10-17 18:43:07 +02:00
Laurent Destailleur
40fdcfac7e
Merge branch 'develop' into 10.0_closure2 2019-10-17 18:16:57 +02:00
Laurent Destailleur
9ce71c26aa Use alpha logo by default 2019-10-15 11:41:22 +02:00
Laurent Destailleur
d6881f9192
Merge pull request #12095 from atm-john/develop_fix_logo_bg 
Fix logo container css name and add hidden conf to remove background
 2019-10-11 16:25:48 +02:00
Laurent Destailleur
7ce01c5ceb Look and feel v11 2019-10-11 14:42:55 +02:00
John Botella
1fdc38da2f Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_fix_logo_bg 2019-10-11 14:36:48 +02:00
Laurent Destailleur
c21224ef96 Align code of auguria menu handler with new architecture 2019-10-11 14:24:47 +02:00
Laurent Destailleur
5801d09dbe NEW Use the squarre logo as favicon of pages 2019-10-11 12:28:13 +02:00
John Botella
4873cbd071 Fix css name 2019-10-11 10:10:12 +02:00
John Botella
13115a55a2 Fix logo background and hidden conf 2019-10-11 10:02:59 +02:00
Frédéric FRANCE
802236f583
db escape 2019-10-02 08:31:46 +02:00
Alexandre SPANGARO
16c6c9ae75 Merge remote-tracking branch 'upstream/develop' into 11.0_https 2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Laurent Destailleur
dc7ad61940 Add class reposition on button that switch the view mode 2019-09-30 17:46:53 +02:00
Laurent Destailleur
6858dce344 Rename table for categorie of warehouses 2019-09-27 13:28:28 +02:00
Laurent Destailleur
a79c4608d6
Merge pull request #11934 from atm-quentin/NEW_stock_categories 
NEW Categories/Tags are also available on warehouses
 2019-09-27 12:41:28 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Laurent Destailleur
1e65a478a8 Fix remove warnings 2019-09-23 19:21:06 +02:00
atm-quentin
c09f2d8c4e NEW stock categories 2019-09-19 16:21:03 +02:00
Laurent Destailleur
34fc04903a Introduce a logo squarred into setup (MAIN_INFO_SOCIETE_LOGO_SQUARRED, 
MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI, ...)
 2019-09-16 15:26:13 +02:00
Laurent Destailleur
76b3668368 FIX regression with option to hide picto on top menu 2019-09-15 15:15:59 +02:00
Laurent Destailleur
755057c99f FIX regression with option to hide picto on top menu 2019-09-15 15:15:46 +02:00
Laurent Destailleur
21d84f63a5 Work on template 2019-09-09 12:58:32 +02:00
Laurent Destailleur
d6f105c783 Work on MRP module 2019-09-07 15:44:48 +02:00
Laurent Destailleur
30d2f84eb7 Remove a label that is no more used 2019-09-07 10:58:20 +02:00
Laurent Destailleur
a481fac289
Merge pull request #11793 from altatof/supplierorderstatus 
Differentiate supplier orders status
 2019-09-07 10:54:03 +02:00
Laurent Destailleur
f08c07f315 Fix bugs reported by scrutinizer 2019-09-06 10:42:51 +02:00
Christophe Battarel
8c8844d7ae Differentiate supplier orders status 2019-08-30 09:33:01 +02:00
Laurent Destailleur
c989a63360 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/langs/en_US/cashdesk.lang
 2019-08-18 20:54:06 +02:00
Laurent Destailleur
d8d927547f Fix option ACCOUNTANCY_SHOW_EXPORT_FILES_MENU 2019-08-18 19:09:53 +02:00
Laurent Destailleur
a46bfc7a29 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/project.lib.php
 2019-07-25 17:54:14 +02:00
Laurent Destailleur
c96ad85126 Add hidden option to avoid experimental to use export files feature 2019-07-23 12:34:17 +02:00
Alexandre SPANGARO
8b8aaafc05 Merge branch 'develop' into 10.0_intracommreport 2019-07-20 05:47:31 +02:00
Alexandre SPANGARO
9ab0734415 NEW Extrafields on salaries 2019-07-19 23:08:24 +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
Alexandre SPANGARO
8f0f8f74f7 WIP 2019-06-26 17:13:38 +02:00
Alexandre SPANGARO
14a99041a3 WIP 2019-06-25 15:31:18 +02:00
Alexandre SPANGARO
20b516885f WIP 2019-06-20 09:33:01 +02:00
Alexandre SPANGARO
abfb708044 Merge branch 'develop' into 10.0_intracommreport 2019-06-19 21:43:40 +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
Alexandre SPANGARO
65070afce4 WIP 2019-05-22 17:22:49 +02:00
Alexandre SPANGARO
a182b89bb0 Merge branch 'develop' into 10.0_closure2 2019-05-22 13:52:13 +02:00
Alexandre SPANGARO
11015dd072 WIP 2019-05-21 09:55:41 +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
Alexandre SPANGARO
876e1147d1 WIP Correct right on fiscal year 2019-05-18 09:41:29 +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
4e16992796 WIP 2019-05-05 14:07:42 +02:00
Alexandre SPANGARO
be1eb7829e Merge remote-tracking branch 'upstream/develop' into 10.0_closure2 2019-05-04 07:41:23 +02:00
Alexandre SPANGARO
2c411310bc FIX Menu Accountancy (Simple) not accessible without module Accountancy (Double entries) 2019-04-25 08:29:43 +02:00
Alexandre SPANGARO
6f9e71dae3 Merge remote-tracking branch 'upstream/develop' into 10.0_closure2 2019-04-24 21:15:54 +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
Alexandre SPANGARO
9957b8aed5 WIP - FEC - Validate 2019-04-15 09:07:36 +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
Laurent Destailleur
f30a3d59ba
Merge branch 'develop' into toomanylines 2019-01-27 17:59:13 +01:00
Laurent Destailleur
4f9f0fd7b5
Merge branch 'develop' into elseif 2019-01-27 17:54:06 +01:00
Frédéric FRANCE
f0cdf300d1
Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
Frédéric FRANCE
496fa9b0fb
PSR2.Files.EndFileNewline.TooMany 2019-01-27 14:10:35 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc
PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +01:00
Frédéric FRANCE
46b6d16210
correct menu 2019-01-27 09:17:01 +01:00
Laurent Destailleur
0eb9985366 Feature must be visible in dev mode 2019-01-16 23:05:32 +01:00
AXeL-dev
1147f2a883 fix duplicate rowid for product - reception menu entries in auguria menu handler 2019-01-12 12:43:24 +01:00
AXeL-dev
546dd1b148 fix mainmenu values for auguria menu entries 2019-01-12 12:21:33 +01:00
ldestailleur
bc00fb177a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-02 19:42:15 +01:00
Laurent Destailleur
713d71bd95 Fix menu 2018-12-28 12:51:54 +01:00
Laurent Destailleur
e0f94bbb59 Add role=navigation 2018-12-28 12:50:23 +01:00
AXeL-dev
663a64ccbb fix proposals menu title in auguria menu manager 2018-12-18 20:20:49 +01:00
Laurent Destailleur
e0e298f07b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-17 03:26:15 +01:00
Laurent Destailleur
e5e4ef7b8c Work on cash fence 2018-12-16 16:47:09 +01:00
Laurent Destailleur
9ce07b9582 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2018-12-16 15:36:18 +01:00
Laurent Destailleur
988ba172ae Clean code of POS modules 2018-12-16 14:59:51 +01:00
Laurent Destailleur
54a4a54afe Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/langs/en_US/banks.lang
 2018-12-15 20:00:31 +01:00
Laurent Destailleur
2bfc5fe235 Work on cash fence 2018-12-15 19:56:08 +01:00
Laurent Destailleur
0451eb741b Work on legal cash fence 2018-12-15 19:20:30 +01:00
Laurent Destailleur
54ffba793f Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/install/mysql/migration/8.0.0-9.0.0.sql
	htdocs/langs/en_US/admin.lang
 2018-12-15 18:21:37 +01:00
andreubisquerra
cdaf048766 First CashControl version 2018-12-15 16:45:36 +01:00
Laurent Destailleur
1167d9aecb
Merge pull request #10206 from andreubisquerra/master 
First CashControl version
 2018-12-15 16:44:24 +01:00
Laurent Destailleur
db46d82de3 Fix position of menu entries 2018-12-15 15:35:59 +01:00
Laurent Destailleur
27f8096afa
Merge branch 'develop' into PR_NEW_reception 2018-12-15 12:50:31 +01:00
Laurent Destailleur
ec3465e65f
Merge pull request #9995 from delcroip/develop 
Add a link for compta-files.php in the accountancy leftmenue
 2018-12-15 12:09:42 +01:00
Laurent Destailleur
48aa6e9ccf
Update eldy.lib.php 2018-12-15 12:09:13 +01:00
Laurent Destailleur
72f8730ce8
Update eldy.lib.php 2018-12-15 12:08:32 +01:00
Laurent Destailleur
05e56984d0
Merge pull request #10056 from frederic34/eldylib 
reduce complexity of eldylib menu
 2018-12-14 17:38:31 +01:00
Laurent Destailleur
b35a9c0e64 FIX Edition of menu fails (mainmenu required for top menu) 2018-12-10 17:50:58 +01:00
andreubisquerra
939f31c71f First CashControl version 2018-12-08 21:33:54 +01:00
Frédéric FRANCE
730863cb09
reduce complexity of eldylib menu 2018-11-20 21:40:37 +01:00
Laurent Destailleur
7f33403d43 Fix translation 2018-11-17 22:55:13 +01:00
patrick Delcroix
e9d3db084a new: link to the compta-files.php in the accountancy left menu 2018-11-10 15:35:56 +01:00
Regis Houssin
89389baeac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
Laurent Destailleur
c74ad61365 Fix look and feel v8 2018-11-08 10:04:25 +01:00
Laurent Destailleur
976516a796 Fix look and feel v8 2018-11-08 09:51:46 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Laurent Destailleur
0e464ea4f5
Merge pull request #9866 from frederic34/emptylines 
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
 2018-10-26 15:31:24 +02:00
Laurent Destailleur
5d249d71ca Fix menu at wrong place 2018-10-26 14:38:26 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Laurent Destailleur
eaab953ba2 Renamed mouvement.php into movement_list.php to follow dev rules 2018-10-24 03:50:18 +02:00
atm-quentin
8442b405b2 Merge branch 'develop' of github.com:Dolibarr/dolibarr into PR_NEW_reception 2018-10-23 10:27:46 +02:00
Laurent Destailleur
dfe9c05d2f Merge menu entry for tags/categories as submenu of element. 2018-10-09 15:26:15 +02:00
Laurent Destailleur
3c8b365c3e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-09 14:53:39 +02:00
Laurent Destailleur
387d9d685a Update auguria menu 2018-10-09 14:52:53 +02:00
Laurent Destailleur
dd0cbabc91 Fix translation 2018-10-09 14:44:13 +02:00
Laurent Destailleur
9bea9edfd7 FIX Menu to show/edit Users categories was missing 2018-10-09 14:41:21 +02:00
Laurent Destailleur
6fcb45cf40 Rename page various_payment/index.php into list.php (coding rule) 2018-10-04 19:10:39 +02:00
Laurent Destailleur
5b350a0322 Use short label 2018-10-04 19:07:38 +02:00
Laurent Destailleur
ebba33635b Close #9674 by keeping old code present (this help for transition tests) 2018-10-04 18:20:57 +02:00
atm-quentin
41d8cb87a3 debut reception setup page 2018-10-03 12:22:41 +02:00
Laurent Destailleur
771922f427 Use 2 distinct left menu entries for leads and projects 2018-10-01 18:56:47 +02:00
Laurent Destailleur
ab0f842db6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-16 12:55:44 +02:00
Laurent Destailleur
4151ca49eb Fix position of menu 2018-09-16 12:15:33 +02:00
Philippe GRAND
33d9e24bd6 Standardize and update code 2018-09-14 11:58:49 +02:00
Philippe GRAND
69bf43f851 Merge remote-tracking branch 'upstream/develop' into new_branch_11_09_2018 2018-09-12 14:48:50 +02:00
Laurent Destailleur
fcabe67e4b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-12 13:30:28 +02:00
Philippe GRAND
05772f5327 Standardize and update code 2018-09-11 17:30:43 +02:00
Laurent Destailleur
700e3b9748 Standardize code for modulepart=mycompany like others modulepart. 2018-09-09 12:53:30 +02:00
Laurent Destailleur
0ef17fe581 FIX Problems with permissions of module to record payment of salaries 2018-09-07 13:32:56 +02:00
Frédéric FRANCE
6aee680a4f
PSR2 ClassDeclaration 2018-08-29 22:06:05 +02:00
Frédéric FRANCE
b03f4004ea
PSR2 FunctionClosingBrace 2018-08-29 21:25:22 +02:00
Philippe GRAND
d91b1fd895 Update and standardize code 2018-08-22 11:06:34 +02:00
Laurent Destailleur
ec56ad752c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2018-08-15 14:26:38 +02:00
Laurent Destailleur
d92096f74a Fix menu payment not required if only module bank on 2018-08-13 02:04:38 +02:00
Laurent Destailleur
5583600066 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-03 17:37:50 +02:00
Laurent Destailleur
50df452b9e Fix status "Supplier" not always visible. 2018-07-03 17:37:23 +02:00
Laurent Destailleur
3112244529
Merge pull request #8884 from defrance/patch-117 
New : fichinter models (like factureRec)
 2018-06-30 01:19:03 +02:00
Laurent Destailleur
969b272576 Rename menu entries and report title for better understanding 2018-06-26 11:18:31 +02:00
Laurent Destailleur
3fa5649040 Fix bad test (dev journal visible when dev option on) 2018-06-23 15:22:39 +02:00
Laurent Destailleur
4dcc74d08f Fix the "back to list" link also restore the contextpage 2018-06-23 11:55:04 +02:00
Laurent Destailleur
f2ac5dab4a Fix contextpage of some menu entries 2018-06-23 10:28:06 +02:00
Laurent Destailleur
b364412a4a FIX Menu scheduled jobs not visible on jmobile conf 2018-06-19 13:10:13 +02:00
BENKE Charlene
0e7c82af95
Update eldy.lib.php 2018-05-28 16:43:23 +02:00
Laurent Destailleur
02803f9284
Merge pull request #8821 from aspangaro/8.0-b26 
Fix Loan : Move to Loadlangs / Remove oldcode (calc) / Presentation / Small problems
 2018-05-25 10:36:46 +02:00
Alexandre SPANGARO
46a251a2b3 FIX : Replace feature level 2 by a constant on accountancy journal 2018-05-24 21:13:48 +02:00
Laurent Destailleur
de84f0e687 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/actions_massactions.inc.php
	htdocs/filefunc.inc.php
 2018-05-21 23:35:09 +02:00
Alexandre SPANGARO
1af4a857be Remove old code 2018-05-19 08:06:24 +02:00
Laurent Destailleur
e503aeb2e5
Merge pull request #8787 from aspangaro/8.0-a24 
Update module assets
 2018-05-18 09:05:46 +02:00
Laurent Destailleur
3e27d7dd2a Report of turnover by vat rate / product type / country 2018-05-15 17:51:19 +02:00
Alexandre SPANGARO
9c6f92986e Upgrade works 2018-05-11 21:48:22 +02:00
Ferran Marcet
d1fd39936c Fix: Bug on invoice status list on left menu 2018-05-08 09:04:04 +02:00
Abbes Bahfir
de8bd3f886 New : Translate accountancy journal menu entries 2018-05-07 08:43:41 +01:00
Laurent Destailleur
546da0ceda Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/account.php
	htdocs/core/modules/modStock.class.php
	htdocs/product/inventory/list.php
 2018-05-05 14:40:39 +02:00
Laurent Destailleur
f6ca1eb624 Fix permission name 2018-05-05 13:24:46 +02:00
Laurent Destailleur
f50a6149d5 Look and feel v8 (menu statistics at end) 2018-05-01 11:09:03 +02:00
Laurent Destailleur
82a8513aed Standardize code 2018-04-29 19:52:14 +02:00
Laurent Destailleur
257dc1cf77 Work on rewriting VAT reports 2018-04-27 19:17:34 +02:00
Laurent Destailleur
6aa2ca7462
Merge pull request #8659 from aspangaro/8.0-a24 
Fix Accountancy
 2018-04-22 20:30:42 +02:00
Laurent Destailleur
769a1f507b Debug asset module 2018-04-22 11:26:59 +02:00
Alexandre SPANGARO
d8e7c98a8d Add nature "inventory" & hide in ventilation journal 2018-04-22 05:56:31 +02:00
Laurent Destailleur
049b9b2a5f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-06 14:19:25 +02:00
Laurent Destailleur
d3adbdfbbc FIX Restaure way to have empty entry menu 2018-04-06 14:04:52 +02:00
Laurent Destailleur
a886fadc2d
Merge pull request #8493 from aspangaro/8.0-a13 
NEW Module Assets
 2018-04-06 12:41:56 +02:00
Laurent Destailleur
2524a699eb Standardize file name of lists 2018-04-06 00:36:52 +02:00
Alexandre SPANGARO
06dc70df09 Merge remote-tracking branch 'uptream/develop' into 8.0-a13 2018-04-05 20:42:28 +02:00
Alexandre SPANGARO
619805c7a5 Update works 2018-04-05 20:40:41 +02:00
Laurent Destailleur
6c409b2670 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-05 18:08:19 +02:00
Alexandre SPANGARO
3779b6ff1c Update work on assets type 2018-04-02 08:22:26 +02:00
Alexandre SPANGARO
3799713c04 Update works 2018-04-02 06:27:55 +02:00
Alexandre SPANGARO
a5428cc8c7 NEW Module Assets 2018-04-01 21:26:52 +02:00
Regis Houssin
20e80a58a8 Fix: limit access to internal users 2018-04-01 11:43:39 +02:00
Laurent Destailleur
224fa1c03e Fix external links ko when substitution key are inside domain 2018-03-24 12:48:33 +01:00
Laurent Destailleur
ab9edef3c7 Fix external links ko when substitution key are inside domain 2018-03-24 12:46:52 +01:00
Laurent Destailleur
d7ad899839 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/card.php
	htdocs/core/class/conf.class.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/holiday/list.php
 2018-03-20 14:52:27 +01:00
Laurent Destailleur
76cceb59a9 Nead perm to read all for monthly report of leave requests 2018-03-20 13:54:52 +01:00
Laurent Destailleur
67483eeb64 NEW Report a list of leave requests for a month 2018-03-20 13:42:29 +01:00
Laurent Destailleur
8cf2d4eb45 Fix filter on holiday statut 
Fix tr/td balance for extrafields on lines
 2018-03-20 10:10:21 +01:00
Laurent Destailleur
c9566e9501
Merge pull request #8392 from aspangaro/8.0-a9 
NEW Add stats in salaries module
 2018-03-15 14:28:35 +01:00
Laurent Destailleur
d804764134 Standardize look and feel 2018-03-15 10:41:43 +01:00
Alexandre SPANGARO
5eccc6bcbc NEW Add stats in salaries module 2018-03-15 06:23:20 +01:00
Laurent Destailleur
64f21b8a3c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expensereport/card.php
 2018-03-11 00:10:13 +01:00
Laurent Destailleur
75b470b580
Update eldy.lib.php 2018-03-10 12:43:01 +01:00
Laurent Destailleur
04bcc4dd46
Update eldy.lib.php 2018-03-10 12:39:39 +01:00
florian HENRY
1c966d4769 on going 2018-03-09 12:57:58 +01:00
Laurent Destailleur
864edce665 NEW Accept anonmymous events (no user assigned) 
NEW Online payment now record the payment on invoices
 2018-03-04 19:39:46 +01:00
Laurent Destailleur
2fc97e5c8c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-12 14:01:34 +01:00
Laurent Destailleur
734bd4d2fb Fix menu visible in dev only 2018-02-12 10:15:58 +01:00
Laurent Destailleur
eb8664e649 NEW Can export leave requests 2018-02-09 16:08:28 +01:00
Laurent Destailleur
eccdc9a075 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/langs/pt_PT/companies.lang
 2018-02-08 15:20:24 +01:00
Laurent Destailleur
b95cd2f383 Fix translation 2018-02-06 19:33:31 +01:00
Laurent Destailleur
69196dc52c Fix menu not visible with auguria module 2018-02-06 18:22:04 +01:00
Laurent Destailleur
22b95b1c43 Simpler top menu code 2018-02-05 23:06:48 +01:00
Laurent Destailleur
85964e02de Fix css 2018-02-05 12:34:11 +01:00
Laurent Destailleur
10e7517596 Fix missing mainmenu and leftmenu into menu definition 2018-02-05 02:29:19 +01:00
Laurent Destailleur
c02d46fb0a Fix leftmenu in menu entries 2018-02-05 01:33:44 +01:00
Laurent Destailleur
7a1a2cf90d Fix send into ledger for bank line record. Show accounted status. 2018-01-22 04:13:29 +01:00
Laurent Destailleur
49f59e0d06 Fix menu visible in experimental mode 2018-01-10 11:02:11 +01:00
Laurent Destailleur
e640831653
Merge pull request #7553 from atm-maxime/new_menu_expense_holidays 
Add detailed menus in HRM module
 2017-12-10 21:15:51 +01:00
Laurent Destailleur
e3dcff7f5b Fix substition for menus title and urls 2017-12-09 15:35:01 +01:00
Maxime Kohlhaas
6b278a6740 Add icons on home page menu 2017-12-07 16:01:52 +01:00
Maxime Kohlhaas
3fb8ec5067 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_menu_expense_holidays 2017-12-06 23:52:02 +01:00
Laurent Destailleur
46b281f703 Fix for #7697 2017-12-01 19:29:29 +01:00
Laurent Destailleur
a0231b5c60 Fix responsive 2017-12-01 12:55:28 +01:00
Laurent Destailleur
501f5b8292 Merge duplicate translation key 2017-11-14 18:26:39 +01:00
Laurent Destailleur
a50589c3c9 NEW Better behaviour when using a text browser 2017-11-14 15:10:46 +01:00
Laurent Destailleur
a98452ae36 Move translation 2017-11-01 10:52:42 +01:00
Laurent Destailleur
d569218162 Fix 'separate' extrafields must be visible by default. 
Sandardize name of list pages (must end with _list.php)
 2017-10-29 11:23:20 +01:00
Laurent Destailleur
9dc4933ba0 Debug 2017-10-24 15:32:01 +02:00
Laurent Destailleur
5fd6a27c62 Fix position of top menu 2017-10-12 02:16:54 +02:00
Laurent Destailleur
a501a20487 NEW Search filters in lists are restored when using "back to list" 2017-10-03 16:00:52 +02:00
Maxime Kohlhaas
a88bcb5299 Add detailed menus in HRM module 2017-10-03 13:49:30 +02:00
Laurent Destailleur
839f3ca41d NEW Can use an url like $conf->global>-MYPARAM for menu urls 2017-09-23 03:22:48 +02:00
Laurent Destailleur
bd45ea5a03 Split page for invoice template into card + list. Add more filters. 2017-09-22 11:28:53 +02:00
Laurent Destailleur
ffe2ee8232 Standardize code 2017-09-19 19:00:28 +02:00
Laurent Destailleur
85d59b32b3 Add timespent entry into HR top menu too 
Faster update of total of timespent
 2017-09-18 13:15:24 +02:00
Laurent Destailleur
0355b0d9ed Merge pull request #7414 from aspangaro/7.0-4 
Accountancy - Finish moving admin to specific menu & some cleaning
 2017-09-18 11:16:36 +02:00
Laurent Destailleur
ad40d27324 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_sendmails.inc.php
 2017-09-16 12:22:18 +02:00
Laurent Destailleur
058b690e25 FIX menu enty when url is external link 2017-09-16 09:22:52 +02:00
Alexandre SPANGARO
c2e1e2491d Accountancy - Finish moving admin to specific menu & some cleaning 2017-09-16 06:53:29 +02:00
Regis Houssin
3ca90df524 Fix: translation 2017-09-15 18:21:50 +02:00
Laurent Destailleur
77056d9adb NEW All setup of accountancy can be done from menu "Accountancy-Setup" 2017-09-15 14:09:42 +02:00
Laurent Destailleur
eadfbfe2bd Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/lib/functions2.lib.php
 2017-09-13 20:57:53 +02:00
Laurent Destailleur
6e3174e71a Fix menu to member cards generation page was lost. 2017-09-12 17:36:19 +02:00
Laurent Destailleur
3001ee5fe7 Fix title of reports 2017-09-12 13:05:34 +02:00
Laurent Destailleur
b645aeb954 Fix lang loading 2017-09-09 09:41:07 +02:00
Laurent Destailleur
b7197530c2 NEW Each user can edit its own email template (menu tools) 2017-09-08 12:48:01 +02:00
Laurent Destailleur
4b9f54e571 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/mysql/data/llx_accounting.sql
	htdocs/install/mysql/migration/5.0.0-6.0.0.sql
	htdocs/install/mysql/tables/llx_holiday_config.sql
 2017-09-01 17:34:57 +02:00
Laurent Destailleur
31a74d448c Work on accounting reports. 2017-08-31 22:38:30 +02:00
Laurent Destailleur
8248bc1c64 Uniformize code of accounting report 2017-08-31 15:44:36 +02:00
Laurent Destailleur
0a67ca53d4 Fix menu auguria 2017-08-30 17:14:54 +02:00
Laurent Destailleur
22ca29a51f Fix sql syntax error 2017-08-29 13:32:25 +02:00
Laurent Destailleur
9312005318 NEW Move accountancy features into a dedicated menu 2017-08-29 12:43:47 +02:00
Laurent Destailleur
b6a7ce6822 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-08-01 10:22:37 +02:00
Laurent Destailleur
800aa4d5b6 Fix bad target 2017-07-31 04:49:54 +02:00
Alexandre SPANGARO
fb4727c408 Add a specific entry in tax menu for various payment 2017-07-28 06:27:04 +02:00
Laurent Destailleur
9e6666e511 Fix translation keys for taxes 2017-07-22 16:40:19 +02:00
Laurent Destailleur
1735a649e9 Fix permission on salary module 2017-07-15 13:02:41 +02:00
Laurent Destailleur
0763d15b4c Debug journalization 
Debug edition of user BAN.
 2017-07-15 12:37:31 +02:00
Alexandre SPANGARO
0c5febfb4d Fix: Accountancy 2017-07-07 06:09:49 +02:00
Laurent Destailleur
b7218c1bcd Fix menu consistency 2017-07-01 03:18:17 +02:00
Laurent Destailleur
31fe8ebcee Debug v6 2017-07-01 02:22:08 +02:00
Laurent Destailleur
92287ab18d Fix url suggested for bookmark did not always include params 2017-06-27 11:12:03 +02:00
Laurent Destailleur
267170b8d2 Fix mainmenu was not correctly set with auguria menu 2017-06-27 10:34:41 +02:00
Laurent Destailleur
3fdfebf7ef Fix position of top menu does not follow 'position' field. 2017-06-27 04:25:41 +02:00
Laurent Destailleur
3b2eb97d72 Fix menu position 2017-06-24 10:29:07 +02:00
Laurent Destailleur
59bd4749a8 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/menus/init_menu_auguria.sql
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/product/class/product.class.php
 2017-06-24 10:27:10 +02:00
Laurent Destailleur
ee8924e101 Fix position of accounting periods 2017-06-24 10:23:38 +02:00
Alexandre SPANGARO
e9b6afd2aa Add last session coding - Add temporaly ledger 2017-06-18 22:17:32 +02:00
Laurent Destailleur
1b56e4a01c Fix look and feel v6 2017-06-14 11:28:42 +02:00
Laurent Destailleur
b889db997a Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/datepicker.php
	htdocs/core/get_menudiv.php
	htdocs/core/menus/standard/auguria.lib.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/search_page.php
	htdocs/main.inc.php
	htdocs/master.inc.php
	htdocs/product/list.php
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php
	htdocs/user/card.php
	htdocs/user/index.php
 2017-06-14 10:48:34 +02:00
Laurent Destailleur
70c7bcc85f Complete css to get value unique 2017-06-13 15:57:30 +02:00
Laurent Destailleur
225c17d047 Fix permission on menu entry 2017-06-13 11:06:57 +02:00
Laurent Destailleur
ffdee40eb9 Fix permission on recurring invoice list 2017-06-13 10:58:41 +02:00
Laurent Destailleur
890ac81e4d Fix menu entried must be greyed, sub menus not visible fi not allowed on 
parent.
 2017-06-10 19:16:42 +02:00