Commit Graph

84330 Commits

Author SHA1 Message Date
Pierre Ardoin
34d7fb887f
Show project Ref support if enable
Add search and Project Ref column in the list, only if project module is enable.
2020-02-19 08:50:49 +01:00
Laurent Destailleur
d0d352be1a FIX #13118 2020-02-19 03:37:28 +01:00
Laurent Destailleur
7c07589850 FIX #13124 2020-02-19 03:07:12 +01:00
Laurent Destailleur
43b173ef76 FIX #13131 2020-02-19 01:23:54 +01:00
Laurent Destailleur
016c7ad875 FIX #13135 2020-02-19 01:17:16 +01:00
Laurent Destailleur
22478e4867 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-19 01:05:42 +01:00
Laurent Destailleur
5e355f786e Update stale bot 2020-02-19 01:05:29 +01:00
Laurent Destailleur
4b6c936f72 Fix stale process 2020-02-19 00:56:45 +01:00
Laurent Destailleur
f1d16d6961
Merge pull request #13138 from indelog/indelog-dev
NEW: Allow custom module class origine type in Mouvementstock
2020-02-19 00:53:04 +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
973539db39
Update index.php 2020-02-18 23:59:53 +01:00
Laurent Destailleur
979d7eb548
Merge pull request #13133 from OPEN-DSI/v10-fix-action-card-assigned-users
FIX keep assigned users in session when loading projects and tasks
2020-02-18 23:51:13 +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
9b522d105e
Merge pull request #13112 from josemariagomezroncero/patch-3
FIX Correction bug dynamic price
2020-02-18 23:48:53 +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
51bc20a110 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/product/card.php
2020-02-18 23:36:42 +01:00
Laurent Destailleur
ce09ec8805 Fix phpcs 2020-02-18 23:35:45 +01:00
oscim
b0016764c4 Update bank.php
For authorize line manager to see wages paid
2020-02-18 22:59:56 +01:00
Laurent Destailleur
afdca18886 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-18 22:59:03 +01:00
Laurent Destailleur
8c52f324ac Fix doxygen 2020-02-18 22:58:51 +01:00
Laurent Destailleur
b9e522114e
Merge pull request #13123 from oscim/patch-21
Update bank.php
2020-02-18 22:56:45 +01:00
Laurent Destailleur
97b4f68e48
Update bank.php 2020-02-18 22:56:37 +01:00
Laurent Destailleur
0212bc5cf2 Try to fix eclipse warnings on doxygen 2020-02-18 22:54:03 +01:00
Laurent Destailleur
97081affdc Fix perm 2020-02-18 22:50:13 +01:00
Laurent Destailleur
b859d4670a Fix perm 2020-02-18 22:49:53 +01:00
Laurent Destailleur
ac2b13ea52
Merge pull request #13119 from ptibogxiv/patch-305
NEW : api for  get user's documents
2020-02-18 22:46:27 +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
fa16063875 Fix bad accounting code set 2020-02-18 22:39:01 +01:00
Laurent Destailleur
31ae0bc06e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/fourn/commande/index.php
	htdocs/product/card.php
2020-02-18 22:38:30 +01:00
root
0dcb83e6bf referer XSS patches 2020-02-18 22:31:24 +01:00
Laurent Destailleur
5c99355e10 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-18 22:30:31 +01:00
Laurent Destailleur
2069438115
Merge pull request #13125 from 418sec/develop
dolibarr - Cross-site Scripting (XSS) - Fix:
2020-02-18 22:29:53 +01:00
Laurent Destailleur
8d9577137a
Merge pull request #13130 from hregis/10.0_mc2
FIX Multicompany compatibility
2020-02-18 22:28:15 +01:00
Laurent Destailleur
c60ae7227f
Merge pull request #13126 from atm-gauthier/10.0_fix_if
FIX : must be == and not =
2020-02-18 22:18:49 +01:00
Laurent Destailleur
e73b57e969
Merge pull request #13134 from atm-ph/fix_11.0_object_linked_from_supplier_order
Fix create supplier invoice from supplier order don't keep source object as linked obkect
2020-02-18 22:18:16 +01:00
Laurent Destailleur
18b99254a1 Experiment ORDER_ENABLE_NEGATIVE 2020-02-18 20:55:22 +01:00
stickler-ci
c6b05040a3 Fixing style errors. 2020-02-18 17:36:00 +00:00
Pierre Ardoin
afadf9dc0e
Fix Not Display Photo with Multicompany 2020-02-18 18:34:15 +01:00
DEMAREST Maxime
30ef5f54dd Allow custom module class origine type in Mouvementstock 2020-02-18 18:24:54 +01:00
atm-ph
bb64d2d353 Fix create supplier invoice from supplier order don't keep source object as linked obkect 2020-02-18 16:00:12 +01:00
Laurent Destailleur
6a97b1b9c8 css 2020-02-18 13:56:24 +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
9ce0e6869e Fix trans 2020-02-18 11:55:39 +01:00
VESSILLER
d1e9f3a505 FIX keep assigned users in session when loading projects and tasks 2020-02-18 11:18:00 +01:00
David Beniamine
1cd566f1ae
Merge tag 'develop' of https://github.com/Dolibarr/dolibarr into takepos-sort-product 2020-02-18 11:09:45 +01:00