Laurent Destailleur
|
2c477c7169
|
Fix doxygen
|
2020-02-20 13:54:41 +01:00 |
|
Laurent Destailleur
|
dacf896f80
|
FIX Can read salary if permission + user under hierarchy
|
2020-02-18 23:44:36 +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
|
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
|
a6b0fec90b
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/exports/class/export.class.php
|
2020-02-17 12:35:34 +01:00 |
|
Laurent Destailleur
|
504a67daee
|
FIX duplicate class name into some log lines
|
2020-02-17 12:34:00 +01:00 |
|
oscim
|
d1652ee9e3
|
Update bank.php
For authorize line manager to see wages paid
|
2020-02-17 11:18:34 +01:00 |
|
Laurent Destailleur
|
52aebce789
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-02-16 18:16:05 +01:00 |
|
Laurent Destailleur
|
7cdfc3ca65
|
FIX HTML Injection
|
2020-02-16 12:55:32 +01:00 |
|
Scrutinizer Auto-Fixer
|
17010478ba
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-02-13 09:44:08 +00:00 |
|
Laurent Destailleur
|
7931734ecb
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/modules/modUser.class.php
|
2020-02-12 20:30:20 +01:00 |
|
Laurent Destailleur
|
e74df397eb
|
FIX #13094
|
2020-02-12 17:28:18 +01:00 |
|
Laurent Destailleur
|
74d3912763
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/fourn/class/fournisseur.facture.class.php
|
2020-02-11 16:52:58 +01:00 |
|
Laurent Destailleur
|
8645fd8946
|
FIX CVE-2019–17223 FIX #13053
|
2020-02-09 18:28:57 +01:00 |
|
Laurent Destailleur
|
716f765ce1
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
|
2020-02-08 16:00:06 +01:00 |
|
Laurent Destailleur
|
85c4013a0d
|
Update card.php
|
2020-02-08 14:52:02 +01:00 |
|
Regis Houssin
|
45ba23da3e
|
FIX #13028
|
2020-02-07 08:53:05 +01:00 |
|
Laurent Destailleur
|
8ab96447c7
|
Page of permissions is cleaner now
|
2020-02-05 21:31:28 +01:00 |
|
Laurent Destailleur
|
1875b6a49b
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/company.lib.php
htdocs/core/lib/security2.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
|
2020-02-05 14:53:47 +01:00 |
|
Laurent Destailleur
|
c015707cbc
|
Fix Only dolibarr logos are in root of theme
|
2020-02-05 14:14:59 +01:00 |
|
Laurent Destailleur
|
37617bbce8
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-02-03 03:48:27 +01:00 |
|
Laurent Destailleur
|
b3a50bd4b0
|
FIX #12874
|
2020-02-03 03:47:45 +01:00 |
|
Laurent Destailleur
|
fc47fa5ec3
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
Conflicts:
htdocs/projet/element.php
|
2020-02-03 02:58:45 +01:00 |
|
Laurent Destailleur
|
8098456f67
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-02-03 02:52:46 +01:00 |
|
Laurent Destailleur
|
90cde17bdb
|
FIX #12986
|
2020-02-03 02:48:05 +01:00 |
|
Scrutinizer Auto-Fixer
|
9781c20f84
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-02-02 18:34:09 +00:00 |
|
Scrutinizer Auto-Fixer
|
5fda829023
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-01-30 00:48:28 +00:00 |
|
Laurent Destailleur
|
be2d6494a7
|
FIX #12908
|
2020-01-28 21:23:05 +01:00 |
|
Laurent Destailleur
|
d3411a79ef
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-01-22 14:11:44 +01:00 |
|
Laurent Destailleur
|
0c666ee73b
|
Fix reponsive
|
2020-01-22 12:46:01 +01:00 |
|
Laurent Destailleur
|
7a0bff06b9
|
Fix reponsive
|
2020-01-22 12:44:10 +01:00 |
|
Laurent Destailleur
|
3f79c00542
|
Merge branch 'develop' into actioncomm_category
|
2020-01-15 14:21:06 +01:00 |
|
Laurent Destailleur
|
9e6fb7b2f1
|
Look and feel v11
|
2020-01-07 14:55:31 +01:00 |
|
Frédéric FRANCE
|
90235d0528
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-12-31 13:57:40 +01:00 |
|
Laurent Destailleur
|
39737c7c4b
|
Fix opacity on text with a href links inside
Fix var not defined
|
2019-12-22 13:19:14 +01:00 |
|
Laurent Destailleur
|
e8db3a2aa0
|
Fix look and feel v11
|
2019-12-19 10:17:20 +01:00 |
|
Laurent Destailleur
|
f44b85f557
|
Fix $_SESSION['newtoken'] must be newToken()
|
2019-12-18 23:12:31 +01:00 |
|
Scrutinizer Auto-Fixer
|
455178ff73
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-12-18 14:20:36 +00:00 |
|
Laurent Destailleur
|
838633d0de
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/system/filecheck.php
htdocs/api/class/api_setup.class.php
htdocs/compta/facture/card.php
htdocs/compta/stats/index.php
htdocs/core/actions_massactions.inc.php
htdocs/install/upgrade2.php
htdocs/loan/card.php
htdocs/loan/document.php
htdocs/loan/info.php
htdocs/loan/note.php
htdocs/loan/schedule.php
htdocs/product/list.php
htdocs/ticket/card.php
htdocs/user/class/user.class.php
|
2019-12-14 14:53:49 +01:00 |
|
Laurent Destailleur
|
8b57e9fcf0
|
Merge pull request #12697 from bb2a/patch-7
Full name in uppercase on creation and modification
|
2019-12-14 14:00:09 +01:00 |
|
Frédéric FRANCE
|
57055bad03
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-12-13 14:36:00 +01:00 |
|
stickler-ci
|
31b09f433f
|
Fixing style errors.
|
2019-12-12 16:29:11 +00:00 |
|
Anthony Berton
|
68a1b12fba
|
Update user.class.php
|
2019-12-12 17:27:24 +01:00 |
|
Frédéric FRANCE
|
12f84d8254
|
doxygen
|
2019-12-11 23:04:27 +01:00 |
|
Frédéric FRANCE
|
66805a502a
|
doxygen
|
2019-12-11 22:53:57 +01:00 |
|
Frédéric FRANCE
|
307bad1d2a
|
doxygen todo
|
2019-12-11 19:11:13 +01:00 |
|
Laurent Destailleur
|
2fd6c690c0
|
Merge pull request #12632 from atm-florianm/FIX_10.0_restore_filter_values_when_returning_to_list_from_card
FIX 10.0: add URL param "restore_last_search_values=1" to all backlinks pointing to lists
|
2019-12-09 15:59:55 +01:00 |
|
Frédéric FRANCE
|
6366a2a606
|
doxygen
|
2019-12-06 18:05:16 +01:00 |
|
Laurent Destailleur
|
22f575dad0
|
Merge pull request #12633 from atm-lena/FIX_getrights_request
FIX getrights() request
|
2019-12-06 16:22:47 +01:00 |
|