Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-26 19:31:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
100,555 Commits 36 Branches 191 Tags
c03958a867d1180e5bcaf99feee94de8acdb334a
Commit Graph

78 Commits

Author SHA1 Message Date
Laurent Destailleur
bb64a25638 Fix CWE-269 - huntr - Fix set of email without edit user permission 2021-05-24 22:11:24 +02:00
Laurent Destailleur
c4f27cc29f Debug module salary 2021-04-18 16:43:09 +02:00
Gauthier PC portable 024
dd83363392 FIX : several bugs on salaries + id salary in payments list 2021-03-05 10:15:35 +01:00
Laurent Destailleur
d5e0a8be56 Fix phpcs 2021-03-04 17:24:13 +01:00
Gauthier PC portable 024
e598b49545 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-26 15:33:36 +01:00
Frédéric FRANCE
b970f4eca6 code syntax user directory 2021-02-26 13:18:40 +01:00
Gauthier PC portable 024
e16bb70922 Merge branch 'NEW/12.0_new_payments_on_salaries' of github.com:ATM-Consulting/dolibarr into NEW/add_real_payments_on_salaries 2021-02-23 15:31:12 +01:00
Gauthier PC portable 024
79e878c26b FIX : salary date 2021-02-23 15:30:42 +01:00
Gauthier PC portable 024
4f767c0823 Merge branch 'NEW/12.0_new_payments_on_salaries' of github.com:ATM-Consulting/dolibarr into NEW/add_real_payments_on_salaries 2021-02-23 15:18:44 +01:00
Gauthier PC portable 024
a767bffc3a FIX : correction of payment salaries list on employee tab of user card 2021-02-23 15:08:27 +01:00
Gauthier PC portable 024
df8ca1ef84 Merge branch '12.0_new_payments_on_salaries' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_salaries 2021-02-05 09:29:20 +01:00
Gauthier PC portable 024
e188ec6cd7 NEW : add real payments on salaries objects 2021-02-04 17:21:08 +01:00
Givriz
dca4cf5987 Feature : ajout de la class "button-cancel" 
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
 2020-11-23 15:12:52 +01:00
Laurent Destailleur
a3faa12753 Fix responsive 2020-11-22 01:28:56 +01:00
Laurent Destailleur
e5e320fd90 Fix null 2020-11-22 01:26:58 +01:00
Laurent Destailleur
6d4d3c618d FIX #15369 and standardize permission "readall" 2020-11-13 09:55:53 +01:00
Laurent Destailleur
47d0b1cd0e Merge pull request #15312 from frederic34/patch-8 
doxygen
 2020-11-06 18:45:46 +01:00
Laurent Destailleur
28cedd3229 Fix permission to edit bank account 2020-11-06 17:31:24 +01:00
Frédéric FRANCE
cbf5332f04 doxygen 2020-11-05 20:18:27 +01:00
Laurent Destailleur
40e18741b3 Fix look and feel v13 2020-11-04 18:05:48 +01:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 13:32:18 +00:00
Frédéric FRANCE
5a3780e062 end of dol_fiche_end 2020-10-27 18:19:31 +01:00
Frédéric FRANCE
9a470fa42d replace deprecated 2020-10-22 22:50:03 +02:00
Laurent Destailleur
718497915c Enhance the IK module 2020-09-21 16:31:51 +02:00
Frédéric FRANCE
b41ac00b98 add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
ee6fadd0d5 add new rule 2020-05-21 01:41:27 +02:00
Maxime Kohlhaas
6e96cbc98d New add personal email and phone on user card 2020-04-15 10:35:21 +02:00
Scrutinizer Auto-Fixer
387ea73bf3 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-13 11:24:42 +00:00
Laurent Destailleur
e18d6bd6b8 Look and feel v12 2020-04-12 17:28:10 +02:00
stickler-ci
9744efc3ec Fixing style errors. 2020-04-11 15:12:11 +00:00
Maxime Kohlhaas
d842a436ae New display of user bank account : same way as on thirdparty 2020-04-11 17:06:50 +02: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
97b4f68e48 Update bank.php 2020-02-18 22:56:37 +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
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
Florian Mortgat
3f6715a377 FIX: add URL param "restore_last_search_values=1" to all backlinks that point to a list 2019-12-05 15:34:41 +01:00
ATM John BOTELLA
773f823748 factoring token usage 2019-12-01 10:20:11 +01:00
Scrutinizer Auto-Fixer
df664e790b Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-11 23:15:34 +00:00
Frédéric FRANCE
35751a80ab 100% centpercent 2019-11-05 21:24:41 +01:00
Laurent Destailleur
ec8bd6327d Fix css 2019-11-04 18:53:46 +01:00
Frédéric FRANCE
e93aaa2a75 replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Laurent Destailleur
aebae5ff83 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/margins.lang
	htdocs/user/class/user.class.php
 2019-10-10 10:37:17 +02:00
Laurent De Coninck
091df082fc fix the access of the bank account of one user 
There are 3 ways to access this tab :
    1. If the module holiday is enabled
    2. If the module holidays is enabled
    3. If the module expense report is enabled

More over that, the application checks if the user can access the bank
account of the selected user. The application does that twice (logical
^^), first to know if the tab has to be displayed or not. Second time,
when you arrive on the page /user/bank.php to know if you have access
(eg. if you type the url directly).

In this second check, the check of the expense report module was missing
(added by this PR). This caused the following issue: the tab was visible
but when the user clicked on itn, he received an error as he cannot
access the page.
 2019-10-08 08:11:29 +02:00
Laurent Destailleur
866dcf18fe Look and feel v11 2019-10-06 15:34:22 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Alexandre SPANGARO
9ab0734415 NEW Extrafields on salaries 2019-07-19 23:08:24 +02:00
Philippe GRAND
60e8c3d7e3 update with html5 compliant code 2019-03-17 10:30:16 +01:00
Frédéric FRANCE
0255336549 fix html5 user 2019-02-16 10:29:15 +01:00
Laurent Destailleur
648eea3a70 Merge branch 'develop' into nospaceaftercomma 2019-01-30 16:00:11 +01:00