Commit Graph

19772 Commits

Author SHA1 Message Date
Frédéric FRANCE
f6eba36575 fix CATEGORY_ADD_DESC_INTO_DOC
$cate->add_category doesn't exists
2020-02-21 18:00:12 +01:00
Laurent Destailleur
9b9f6d5da4 Merge pull request #13151 from frederic34/patch-6
fix CATEGORY_ADD_DESC_INTO_DOC
2020-02-21 17:55:19 +01:00
Scrutinizer Auto-Fixer
e44865d8b5 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-21 16:53:37 +00:00
Laurent Destailleur
55bef402c4 Fix remove a lot of warnings on Eclipse 2020-02-21 17:47:36 +01:00
Laurent Destailleur
ec09e7222d Fix remove a lot of warnings on Eclipse 2020-02-21 17:31:37 +01:00
Laurent Destailleur
7e4af04886 CSS For bookmark dropdown 2020-02-21 17:18:01 +01:00
Laurent Destailleur
be3ecb3093 Remove hidden constant MAIN_EXTRAFIELDS_IN_ONE_TD that was useless 2020-02-21 14:32:53 +01:00
Laurent Destailleur
7909055ee8 Enhance multilangue support in website module 2020-02-21 11:36:16 +01:00
Laurent Destailleur
1f4b639ba0 Debug MRP module 2020-02-20 17:44:03 +01:00
andreubisquerra
e316061a9a Fix travis 2020-02-20 16:26:30 +01:00
andreubisquerra
7a241ba042 Fix travis 2020-02-20 15:47:40 +01:00
Laurent Destailleur
c29e1e78f3 NEW Bookmarks are now in top menu bar 2020-02-20 15:43:31 +01:00
Laurent Destailleur
593091f399 FIX etrafield with visibilty=5 were not in read only
FIX CSS
FIX option for topbar search and bookmarks

Conflicts:
	htdocs/theme/eldy/global.inc.php
2020-02-20 15:29:59 +01:00
Laurent Destailleur
a3fce650d9 FIX etrafield with visibilty=5 were not in read only
FIX CSS
FIX option for topbar search and bookmarks
2020-02-20 15:25:32 +01:00
javierybar
2942e85e47 More elegant and easy to understand printer setup 2020-02-20 15:16:17 +01:00
Ferran Marcet
9ff424e23b FIX: Visualization rights correction on last modified contacts box 2020-02-20 11:45:46 +01:00
Frédéric FRANCE
523e161f33 fix CATEGORY_ADD_DESC_INTO_DOC
$cate->add_category doesn't exists
2020-02-20 09:45:17 +01:00
Alexandre SPANGARO
a7ca7dfbb6 FIX: z-index for moretabsList with constant MAIN_MAXTABS_IN_CARD 2020-02-20 06:00:17 +01:00
Laurent Destailleur
ac5e9ce5b3 Fix doc 2020-02-20 01:34:33 +01:00
Laurent Destailleur
76f0df138b Try to fix doc 2020-02-20 01:26:40 +01:00
Laurent Destailleur
5c48f6f405 Lang of web site is optional 2020-02-20 01:08:53 +01:00
Laurent Destailleur
895503d2eb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/index.php
	htdocs/core/class/CMailFile.class.php
2020-02-20 00:21:25 +01:00
Laurent Destailleur
2cfca2a45e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/comm/action/card.php
	htdocs/comm/index.php
	htdocs/core/boxes/box_fournisseurs.php
	htdocs/core/boxes/box_propales.php
	htdocs/societe/index.php
2020-02-20 00:18:58 +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
ace0c7f89d Fix list of opportunity with filter on search_usage_opportunity 2020-02-19 14:31:32 +01:00
Laurent Destailleur
0c571c0376 Restore common behaviour: Draft object are on left under graph.
Open and live objects are on right
2020-02-19 14:20:55 +01:00
Laurent Destailleur
f109864670 NEW Add a profil to import contact categories
Load roles of contact only when required
2020-02-19 13:22:24 +01:00
Laurent Destailleur
1dd5ba093d Prepare PHP v8 - mktime() and gmmktime() are no more allowed 2020-02-19 12:11:16 +01:00
Laurent Destailleur
ac16857501 GETPOST(..., 'alpha') remove " if found instead of returning '' 2020-02-19 11:33:45 +01:00
Laurent Destailleur
7c07589850 FIX #13124 2020-02-19 03:07:12 +01:00
Laurent Destailleur
016c7ad875 FIX #13135 2020-02-19 01:17:16 +01:00
Laurent Destailleur
9883c0b688 Merge pull request #12677 from OPEN-DSI/new-project-weighted-amount
NEW add weighted amount on project/opportunity
2020-02-19 00:03:03 +01:00
Laurent Destailleur
ce3e977fc3 Merge pull request #13141 from Dolibarr/scrutinizer-patch-5
Scrutinizer Auto-Fixes
2020-02-18 23:49:10 +01:00
Laurent Destailleur
88b104bc2f Merge pull request #13121 from aspangaro/12.0_a14
NEW: Donation - Update FR CERFA to 11580*04
2020-02-18 23:48:08 +01:00
Scrutinizer Auto-Fixer
fd48877dc6 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-18 22:47:25 +00:00
Laurent Destailleur
dacf896f80 FIX Can read salary if permission + user under hierarchy 2020-02-18 23:44:36 +01:00
Laurent Destailleur
ce09ec8805 Fix phpcs 2020-02-18 23:35:45 +01:00
Laurent Destailleur
2ac064059a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/projet/element.php
2020-02-18 22:40:43 +01:00
Laurent Destailleur
24bb61b5e4 FIX Usage of project not available in export. 2020-02-18 12:51:53 +01:00
Laurent Destailleur
b6be42e103 FIX List of viewed projects too large in task widget 2020-02-18 12:40:50 +01:00
Laurent Destailleur
67eb584a7f FIX Missing field "billed" in export 2020-02-18 12:22:25 +01:00
Laurent Destailleur
7e814e2a08 FIX Menu truncated. Add tooltip to have all content. 2020-02-18 12:01:19 +01:00
Laurent Destailleur
b618581692 More ajax button in setup. Can reload after on ajaxonoff. 2020-02-18 09:38:34 +01:00
Laurent Destailleur
6555f5d74f More default hmtl tags in restricthtmlonly 2020-02-17 20:55:17 +01:00
Pierre Ardoin
f8e18a3826 Fix Not displayed email 2020-02-17 19:25:25 +01:00
Pierre Ardoin
a773b86ad1 Fix not displayed value 2020-02-17 19:23:48 +01:00
Pierre Ardoin
29cfd6d857 Fix issue with Multicompany
Before : can't find photo

Now : ok
2020-02-17 19:18:22 +01:00
Pierre Ardoin
f1bbe1c64d Fix issue not show photo. 2020-02-17 19:09:58 +01:00
Laurent Destailleur
299219891e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-17 12:41:45 +01:00
Laurent Destailleur
25fa83bd06 Fix phpcs 2020-02-17 12:40:26 +01:00