lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
102,103 Commits 43 Branches 150 Tags 886 MiB
scrutinizer-patch-2
Commit Graph

207 Commits

Author SHA1 Message Date
Laurent Destailleur
141ca20269 Trans 2020-01-15 14:44:53 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Laurent Destailleur
92070fa491 Fix name of variable $trigger_name into $triggersendname 2019-12-02 09:38:16 +01:00
Scrutinizer Auto-Fixer
ddcc14dc16 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-14 11:09:15 +00:00
Scrutinizer Auto-Fixer
ac40dd8bbe Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:35:39 +00:00
Frédéric FRANCE
35751a80ab
100% centpercent 2019-11-05 21:24:41 +01:00
Laurent Destailleur
94bd0f71d9 Fix pb with permission 2019-11-05 19:41:30 +01:00
Frédéric FRANCE
dbed10a701
Merge remote-tracking branch 'upstream/develop' into socid 2019-11-01 21:39:20 +01:00
Laurent Destailleur
b19593bb8e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/holiday/card.php
 2019-11-01 21:30:19 +01:00
Laurent Destailleur
cf2ee892ee FIX security check. A user can see holiday with link without permissions 2019-11-01 21:27:19 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Laurent Destailleur
76aef85ee4
Merge pull request #12015 from atm-maxime/new_validators 
NEW expense request and holiday validator fields
 2019-10-07 13:31:20 +02:00
Laurent Destailleur
866dcf18fe Look and feel v11 2019-10-06 15:34:22 +02:00
Laurent Destailleur
2b66282b61 NEW Code for extrafields uses the new array $extrafields->attributes 2019-10-06 14:41:52 +02:00
Laurent Destailleur
1f3e250053
Update card.php 2019-10-03 17:58:07 +02:00
Maxime Kohlhaas
6d4f3f308e NEW expense request and holiday validator fields 2019-10-02 08:43:40 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Laurent Destailleur
b3c49f2ec8 End of dev for extrafields on holiday 2019-09-24 16:26:15 +02:00
Laurent Destailleur
961f2b5165 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/categories/viewcat.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/takepos/invoice.php
 2019-09-24 14:25:02 +02:00
Laurent Destailleur
7b3e64d67f NEW Support of Extrafields on Leave requests. 2019-09-24 12:01:18 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Laurent Destailleur
24cb1390e4 FIX Update of leave request when CSRF with token is on 
FIX Export of leave request show the number of open days
 2019-09-17 13:17:25 +02:00
Laurent Destailleur
9a823f1c64 Fix bad perm 2019-09-05 22:51:26 +02:00
Laurent Destailleur
e91b6f7843 FIX Can't delete a draft leave even if it should 2019-09-05 22:48:33 +02:00
Laurent Destailleur
a3d417a40f Fix can't change approver of a leave request in some cases 2019-09-04 11:21:41 +02:00
Laurent Destailleur
a6fc75fed2 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/expensereport/card.php
 2019-06-23 18:12:30 +02:00
Laurent Destailleur
0854984a08 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/holiday/card.php
 2019-06-23 18:09:49 +02:00
Laurent Destailleur
b153019000 FIX security (a user can read leave or holiday of other without perm. 2019-06-23 18:08:24 +02:00
Laurent Destailleur
08d5ca4ddb Debug page to export accounting documents 2019-06-17 17:53:43 +02:00
Laurent Destailleur
fd0eb47b35 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/holiday/card.php
 2019-05-29 09:57:48 +02:00
Laurent Destailleur
a26c8c0714 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-05-29 09:55:55 +02:00
Laurent Destailleur
2352463c21 Fix link to change validator is on validate status only 2019-05-28 13:23:12 +02:00
Laurent Destailleur
1ed7c225d7 Fix status of holiday 2019-05-27 20:25:40 +02:00
Laurent Destailleur
2aa19e469d Fix edit validator 2019-05-27 20:23:40 +02:00
Laurent Destailleur
b691b3e883 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-05-27 20:22:42 +02:00
Laurent Destailleur
666e4fdb5f Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-05-27 20:22:21 +02:00
Laurent Destailleur
991e247e30 Fix edit of validator 2019-05-27 20:21:50 +02:00
Laurent Destailleur
4c3a056dbe Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/holiday/card.php
 2019-05-27 20:19:23 +02:00
Laurent Destailleur
f5d51dab5f Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/holiday/card.php
 2019-05-27 20:14:37 +02:00
Laurent Destailleur
02fc896612 FIX Even with permission, can't validate leave once validator defined. 2019-05-27 20:12:33 +02:00
Laurent Destailleur
2bbb04085e Merge branch '9.0' of https://github.com/dolibarr/dolibarr into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/modulebuilder/template/class/myobject.class.php
 2019-05-19 02:15:01 +02:00
Maxime Kohlhaas
28a4785b3a Fix missing TOKEN 2019-05-18 17:06:23 +02:00
Laurent Destailleur
8ca5b2e45f Rename field 2019-03-22 17:43:53 +01:00
Laurent Destailleur
e326c4d579 Look and feel v10 2019-03-15 10:48:10 +01:00
Frédéric FRANCE
b69f63e7d7
replace html by html5 2019-03-10 09:32:19 +01:00
Laurent Destailleur
d6628a87a9 Fix phpcs 2019-02-08 17:48:24 +01:00
Laurent Destailleur
f333fb3b7d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-08 14:59:07 +01:00
Laurent Destailleur
8412a91576 Fix do not send email if approval error 2019-02-08 14:58:46 +01:00
Laurent Destailleur
7f9d995c9c Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/holiday/card.php
 2019-02-08 14:54:31 +01:00
Laurent Destailleur
2e1201b7b0 FIX Transaction on leave approval and decrease ko if setup not complete 2019-02-08 14:47:03 +01:00
Laurent Destailleur
648eea3a70
Merge branch 'develop' into nospaceaftercomma 2019-01-30 16:00:11 +01:00
Alexandre SPANGARO
cc88c4f8ff Move my email to the new one 2019-01-28 21:39:22 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc
PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +01:00
Frédéric FRANCE
731d19a29b
add tooltip to butActionRefused 2018-11-13 21:40:17 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Laurent Destailleur
0e464ea4f5
Merge pull request #9866 from frederic34/emptylines 
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
 2018-10-26 15:31:24 +02:00
Laurent Destailleur
8b601bd7fd Fix numbering of holidays 2018-10-25 18:50:53 +02:00
Laurent Destailleur
25a374bd9a NEW Notification module support expense report+holiday validation and 
approval event.
 2018-10-25 12:45:13 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Frédéric FRANCE
a3fa13994b
replace select_date 2018-09-09 09:36:12 +02:00
Frédéric FRANCE
4a7ea33008
replace select_date 2018-09-09 08:02:26 +02:00
Laurent Destailleur
9fc5d39d07 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-12 20:09:36 +02:00
Laurent Destailleur
0a1c6e7194 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/compta/facture/list.php
	htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
 2018-08-12 20:08:20 +02:00
florian HENRY
74d05da149 fix : display if error 2018-08-06 11:28:34 +02:00
Frédéric FRANCE
a0a5d33641
test include 2018-07-26 17:30:53 +02:00
Laurent Destailleur
5c93fa1bfb Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/journals_list.php
	htdocs/compta/facture/fiche-rec.php
	htdocs/core/class/html.form.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/fr_FR/other.lang
 2018-06-26 01:25:03 +02:00
Laurent Destailleur
d9fc1e0b5d Fix param to avoid to create holiday or expense report in wrong entity. 2018-06-25 10:09:01 +02:00
Frédéric FRANCE
622c394283
loadlangs 2018-05-26 21:11:25 +02:00
Laurent Destailleur
9315d9c423 NEW Introduce permission "approve" for "leave request" like for "expense 
report"
 2018-05-10 18:56:21 +02:00
Laurent Destailleur
46a8511c69 Look and feel v8 (delete button in end of list) 2018-04-26 18:25:57 +02:00
Laurent Destailleur
fc50fcd59e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-20 20:07:24 +01:00
Laurent Destailleur
fe53ff56ee FIX Error management in leave request 2018-03-20 20:03:44 +01:00
Laurent Destailleur
d7ad899839 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/card.php
	htdocs/core/class/conf.class.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/holiday/list.php
 2018-03-20 14:52:27 +01:00
Laurent Destailleur
67483eeb64 NEW Report a list of leave requests for a month 2018-03-20 13:42:29 +01:00
Laurent Destailleur
a325bbf865 FIX Input of holiday for subordinates was ko 2018-03-19 20:46:43 +01:00
Laurent Destailleur
14e80948b8 FIX approval date was not visible if leave was canceled after 2018-03-19 17:53:33 +01:00
Laurent Destailleur
91cc3d1b73 FIX navigation and filters on holiday list 2018-03-19 16:11:42 +01:00
Laurent Destailleur
e0164884ee Better management of hidden option HOLIDAY_HIDE_BALANCE 2018-03-19 15:13:36 +01:00
Laurent Destailleur
eb03fb7540 Fix trad/compatibility 2018-03-19 15:00:50 +01:00
Laurent Destailleur
8889e7f4b2 FIX translation of holiday types 2018-03-19 14:09:44 +01:00
Laurent Destailleur
0cc84ab92f FIX Missing restore_lastsearch_values 2018-02-26 21:21:28 +01:00
Laurent Destailleur
b361877ea8 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/compta/facture/card.php
 2018-02-20 12:48:28 +01:00
Laurent Destailleur
4056b87a74 Fix syntax error 2018-02-20 12:36:03 +01:00
Laurent Destailleur
7321829732 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-02-20 12:34:15 +01:00
Laurent Destailleur
ea071b7680 Fix can't delete holiday refused 2018-02-20 12:31:26 +01:00
Laurent Destailleur
71c968b0b1 Fix lose validator user in edit 2018-02-09 16:06:48 +01:00
Laurent Destailleur
0a73daba01 Security: on target=_blank, we must have rel="noopener" 2017-12-02 03:04:52 +01:00
Laurent Destailleur
33910b9cc9 Add the trackid for emails sent from leave request card. 2017-11-15 11:29:22 +01:00
Laurent Destailleur
a501a20487 NEW Search filters in lists are restored when using "back to list" 2017-10-03 16:00:52 +02:00
Laurent Destailleur
fea5746618 Standardize look and feel on leave request module 2017-10-02 18:17:16 +02:00
Laurent Destailleur
c9e9f60f8f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2017-09-25 19:55:52 +02:00
Laurent Destailleur
c5287e68b1 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/admin/multicurrency.php
	htdocs/core/modules/modFournisseur.class.php
 2017-09-25 19:54:27 +02:00
Laurent Destailleur
3cc7f66e90 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-09-25 19:48:42 +02:00
Laurent Destailleur
5776a948c4 Update card.php 2017-09-24 21:54:26 +02:00
fmarcet
72108c3a4e Fix: #7358 User can't create holiday requests with 'Create/modify your leave requests' rights 2017-09-21 15:59:50 +02:00
Laurent Destailleur
8773a6860f Fix HTML5 use of <br> is preferred to <br /> 2017-09-15 23:49:04 +02:00
Laurent Destailleur
19ba90f577 Fix creation of leave request 2017-08-01 13:17:27 +02:00