Laurent Destailleur
|
e7ba73bf2d
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-02-20 01:09:43 +01:00 |
|
Laurent Destailleur
|
5c48f6f405
|
Lang of web site is optional
|
2020-02-20 01:08:53 +01:00 |
|
Laurent Destailleur
|
7796724d63
|
Update list.php
|
2020-02-20 01:07:41 +01:00 |
|
Laurent Destailleur
|
960302c012
|
Merge branch 'develop' into patch-35
|
2020-02-20 01:07:08 +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
|
c14daa2790
|
Can set main language and sublanguages of a website
|
2020-02-19 18:32:04 +01:00 |
|
Laurent Destailleur
|
44c2909696
|
FIX Multicompany compatibility
|
2020-02-19 16:08:33 +01:00 |
|
Laurent Destailleur
|
3fafbb372b
|
Remove call of $mc->dao than hangs. Replaced with $mc use.
|
2020-02-19 15:51:27 +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
|
db1e324ba5
|
Fix trans
|
2020-02-19 13:58:04 +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
|
394c256ca1
|
Merge pull request #13129 from mapiolca/patch-33
Fix issue with unselect data
|
2020-02-19 11:37:52 +01:00 |
|
Laurent Destailleur
|
ac16857501
|
GETPOST(..., 'alpha') remove " if found instead of returning ''
|
2020-02-19 11:33:45 +01:00 |
|
Pierre Ardoin
|
bebc37abe3
|
Update list.php
|
2020-02-19 08:54:10 +01:00 |
|
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
|
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
|
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
|
18b99254a1
|
Experiment ORDER_ENABLE_NEGATIVE
|
2020-02-18 20:55:22 +01:00 |
|