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

935 Commits

Author SHA1 Message Date
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
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
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
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