2
0
forked from Wavyzz/dolibarr
Commit Graph

6320 Commits

Author SHA1 Message Date
Laurent Destailleur
ec83f18944 Move more icon definition into CSS 2020-03-28 13:38:25 +01:00
Matt Sidnell
6f07b87cde Update admin.lib.php 2020-03-27 23:22:02 +00:00
Matt Sidnell
f93bdf6b22 Fix so company_admin tabs do not show in Societe
fix
2020-03-27 23:09:40 +00:00
Matt Sidnell
815ae3cb09 Ability to add new tabs on company admin section
I have added the option to add a tab from a module to the main company setup section.  I need this ability so thought that others might too.
2020-03-27 21:51:34 +00:00
Laurent Destailleur
c27592bad2 Clean deprecated params on all fetch_optionals() 2020-03-27 16:02:58 +01:00
stickler-ci
208049a8f2 Fixing style errors. 2020-03-26 07:27:10 +00:00
florian HENRY
aded72a6fa Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_tasklist_columnAndExtrafields 2020-03-26 08:24:39 +01:00
florian HENRY
21b98a7c4c set as global 2020-03-26 08:24:20 +01:00
Laurent Destailleur
20fad86520 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/cashcontrol/cashcontrol_card.php
2020-03-26 00:14:06 +01:00
Laurent Destailleur
3855ef6073 Add rounding code 'CR' (currency rate' 2020-03-25 17:41:39 +01:00
Laurent Destailleur
f509c6a266 Add user id into ajaxconst_onoff 2020-03-25 16:00:42 +01:00
florian HENRY
81d86f717d Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_tasklist_columnAndExtrafields 2020-03-25 12:14:54 +01:00
Laurent Destailleur
92db075aa1 Add parameter morecss to img_credit_card() 2020-03-24 21:40:25 +01:00
florian HENRY
6e4038a051 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_tasklist_columnAndExtrafields 2020-03-24 19:50:19 +01:00
florian HENRY
46a4184f15 NEW : Project task list, add column selector and extrafields 2020-03-24 19:50:01 +01:00
Laurent Destailleur
62fefab5ac Standardize color of status 2020-03-24 19:06:37 +01:00
gauthier
4c0de74470 FIX : sort by default role makes no sense 2020-03-24 16:27:53 +01:00
Laurent Destailleur
a5379c7144 FIX All forms must use newToken()
Conflicts:
	htdocs/commande/card.php
	htdocs/compta/cashcontrol/cashcontrol_card.php
	htdocs/supplier_proposal/card.php
2020-03-24 13:14:23 +01:00
Laurent Destailleur
1ff15e1fd9 FIX All forms must use newToken() 2020-03-24 13:10:35 +01:00
Laurent Destailleur
2b33ef7e46 Align color of graph of status on status color 2020-03-24 13:06:59 +01:00
Laurent Destailleur
f56de9f177 Fix autocalculation of timespent in monthy mode 2020-03-23 22:04:40 +01:00
Laurent Destailleur
063cf15bcb Clean code 2020-03-23 20:16:51 +01:00
Laurent Destailleur
c249a1af14 Merge pull request #13408 from Dolibarr/scrutinizer-patch-3
Scrutinizer Auto-Fixes
2020-03-23 17:39:09 +01:00
Laurent Destailleur
2a310b09af Fix phpcs 2020-03-23 17:24:47 +01:00
Laurent Destailleur
b18d3e5588 Fix var not defined 2020-03-23 15:58:47 +01:00
Scrutinizer Auto-Fixer
e8083e2a65 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-03-23 14:54:02 +00:00
Laurent Destailleur
01e60562b9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/fourn/commande/index.php
	htdocs/takepos/takepos.php
2020-03-23 15:38:10 +01:00
Laurent Destailleur
24dc202022 Doc 2020-03-23 15:33:52 +01:00
Laurent Destailleur
2177afecd9 Sort order 2020-03-23 14:12:48 +01:00
Alexandre SPANGARO
7d22ccbd12 Merge remote-tracking branch 'upstream/develop' into 12.0_a23 2020-03-23 05:50:07 +01:00
Laurent Destailleur
c80c247a84 Fix phpcs 2020-03-22 20:22:33 +01:00
Laurent Destailleur
3eaed6bfc8 Fix phpcs 2020-03-22 20:22:08 +01:00
Laurent Destailleur
6f3cbe69e8 Fix phpcs 2020-03-22 19:40:58 +01:00
Laurent Destailleur
b0f3fba71a Fix phpcs 2020-03-22 18:27:56 +01:00
Laurent Destailleur
3d6849dfea Fix label of tabs 2020-03-22 17:27:08 +01:00
Alexandre SPANGARO
c05ef16e0b Work on split module fournisseur 2020-03-22 05:51:14 +01:00
Laurent Destailleur
bcf17c79ef FIX closing tags 2020-03-22 02:44:00 +01:00
Laurent Destailleur
e2acb0c65e code indent 2020-03-21 19:37:09 +01:00
Laurent Destailleur
792b9228d3 Can search in several different type of containers 2020-03-21 19:09:14 +01:00
Laurent Destailleur
83b8497d28 Rename sample file so we can use color editor 2020-03-21 17:58:03 +01:00
Laurent Destailleur
4ce1665a15 Fix charset in RSS export 2020-03-21 17:36:07 +01:00
Laurent Destailleur
79086011f8 Work on RSS export of blog posts 2020-03-21 17:31:44 +01:00
Laurent Destailleur
666b38b44a Fix charset in RSS export 2020-03-21 17:31:09 +01:00
Laurent Destailleur
7370268b13 Tool to regenerate files 2020-03-21 11:04:33 +01:00
Laurent Destailleur
27015fc6f6 NEW Add method to add social network sharing buttons on blog posts 2020-03-20 19:34:49 +01:00
Laurent Destailleur
a2f9f72973 Enhance website module 2020-03-20 18:58:45 +01:00
Laurent Destailleur
f904ff5240 Add dol_escape_json method 2020-03-20 17:10:35 +01:00
Laurent Destailleur
aa1f601528 FIX Backto link 2020-03-20 16:30:45 +01:00
Laurent Destailleur
a0086d73a1 Merge pull request #13371 from aspangaro/12.0_a23
Work on split module fournisseur
2020-03-20 10:37:54 +01:00
Laurent Destailleur
222556b464 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/accounting-files.php
	htdocs/core/lib/functions.lib.php
2020-03-19 22:09:17 +01:00