lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
95,736 Commits 43 Branches 150 Tags 886 MiB
150cb052d9
Commit Graph

2627 Commits

Author SHA1 Message Date
Laurent Destailleur
d5e0a8be56 Fix phpcs 2021-03-04 17:24:13 +01:00
Laurent Destailleur
7d20df8054
Merge pull request #16177 from atm-gauthier/NEW/add_real_payments_on_salaries 
NEW Salary payment request and Salary payment are 2 different steps in workflow on Salary payment recording
 2021-03-04 16:53:54 +01:00
Laurent Destailleur
7f1d61f8a8 Fix phpcs 2021-03-02 15:34:43 +01:00
Laurent Destailleur
7144e80063
Merge pull request #16322 from FHenry/dev_new_conf_defaulteventstatus 
NEW: Conf for default actiomm status when created from card (and DefaultValues CRUD class)
 2021-03-02 14:45:05 +01:00
Laurent Destailleur
3a00952cd1
Update user.class.php 2021-03-02 14:44:31 +01:00
stickler-ci
54d35fa59f Fixing style errors. 2021-03-01 20:00:32 +00:00
Frédéric FRANCE
a4e25359e7
add missing rule 2021-03-01 20:37:16 +01:00
Florian HENRY
f62386a6a5 set Default values as CURD classes 2021-03-01 20:36:42 +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
939d406ab1 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-22 09:10:24 +01:00
Laurent Destailleur
2be6992916 Fix include_once into include for inc.php file. See comment in #16338 2021-02-19 16:10:19 +01:00
Anthony Berton
ae9582286d Update user.class.php 2021-02-17 16:39:03 +01:00
Anthony Berton
060bfde082 20200217 2021-02-17 15:26:56 +01:00
Gauthier PC portable 024
41af1a59f4 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-08 10:37:01 +01:00
Laurent Destailleur
84a4d8f8f1
Merge pull request #16201 from frederic34/patch-1 
fix html
 2021-02-07 19:56:56 +01:00
Frédéric FRANCE
c3d1f3de3c
fix html 2021-02-07 19:12:26 +01:00
Frédéric FRANCE
8d49ca9f0d
fix html 2021-02-07 18:49:46 +01:00
Frédéric FRANCE
05c7bcf70f
Update perms.php 2021-02-07 18:45:34 +01:00
Frédéric FRANCE
b4e6a49930
Update card.php 2021-02-07 18:35:03 +01:00
Frédéric FRANCE
b74ea17dd2
fix html 2021-02-07 18:14:50 +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
Laurent Destailleur
726ef265f2 Look and feel v14 2021-02-04 19:21:07 +01:00
Gauthier PC portable 024
e188ec6cd7 NEW : add real payments on salaries objects 2021-02-04 17:21:08 +01:00
Laurent Destailleur
a4c0459c1e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/user/list.php
 2021-01-27 21:09:01 +01:00
Laurent Destailleur
b50728d4fb FIX #16076 2021-01-27 21:04:48 +01:00
Laurent Destailleur
13378897a8 FIX Report by Ricardo Matias 
Conflicts:
	test/phpunit/SecurityTest.php
 2021-01-25 22:52:30 +01:00
Laurent Destailleur
6a12de741f FIX Report by Ricardo Matias 2021-01-25 22:46:09 +01:00
Laurent Destailleur
0f5fc7353e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/index.php
	htdocs/admin/mailing.php
	htdocs/admin/paymentbybanktransfer.php
	htdocs/admin/prelevement.php
	htdocs/modulebuilder/template/admin/setup.php
 2021-01-24 15:29:53 +01:00
Laurent Destailleur
b4783f69d6 Show if permission is an advanced permission 2021-01-23 18:13:50 +01:00
Laurent Destailleur
113ef1a02b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/user/class/user.class.php
 2021-01-19 16:21:53 +01:00
Laurent Destailleur
934070f14e Backport FIx #15970 2021-01-19 10:56:46 +01:00
Laurent Destailleur
8cd8f21fde
Update user.class.php 2021-01-19 10:53:47 +01:00
lmarcouiller
73eee33f8a redo of pull request with sql updated 2021-01-19 09:24:15 +01:00
stickler-ci
7e0f83d97e Fixing style errors. 2021-01-18 16:06:06 +00:00
lmarcouiller
7c7f80fb59 update pull request with sql in simple quotes 2021-01-18 17:05:15 +01:00
lmarcouiller
841736df87 Fix #15970 user.class.php 2021-01-18 14:20:30 +01:00
Laurent Destailleur
b4be544350
Merge pull request #15978 from bb2a/tel_on_list_users 
NEW Add column "Office phone" and  "User mobile" in user list
 2021-01-16 18:06:19 +01:00
Laurent Destailleur
aaddda9a6e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/bookkeeping/listbysubaccount.php
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/user/class/usergroup.class.php
 2021-01-14 14:13:08 +01:00
Laurent Destailleur
16d98d2691 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/fr_FR/admin.lang
	htdocs/projet/graph_opportunities.inc.php
	htdocs/user/class/usergroup.class.php
 2021-01-14 14:09:09 +01:00
Laurent Destailleur
446e3b9a9d css 2021-01-14 13:26:54 +01:00
Anthony Berton
6726d5781d Update list.php 2021-01-14 08:41:04 +01:00
Anthony Berton
2c31e0989d Update list.php 2021-01-14 08:25:57 +01:00
Anthony Berton
b143fb6b9e Update list.php 2021-01-13 18:52:27 +01:00
Florian HENRY
77f213832e fix: update group name 2021-01-11 19:40:44 +01:00
Laurent Destailleur
f411b29b28 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/listbysubaccount.php
	htdocs/langs/en_US/main.lang
	htdocs/langs/fr_FR/accountancy.lang
 2021-01-09 02:34:43 +01:00