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

483 Commits

Author SHA1 Message Date
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
64f21b8a3c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expensereport/card.php
 2018-03-11 00:10:13 +01:00
florian HENRY
f37d482331 fix warning and sql error 2018-03-09 11:37:23 +01:00
Laurent Destailleur
0cc84ab92f FIX Missing restore_lastsearch_values 2018-02-26 21:21:28 +01:00
Laurent Destailleur
3c552cec15 FIX Missing restore_lastsearch_values 2018-02-26 21:16:40 +01:00
Laurent Destailleur
7e48db2869 Clean code 2018-02-26 15:03:09 +01:00
Laurent Destailleur
f207e91643 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/holiday/define_holiday.php
	htdocs/main.inc.php
	htdocs/societe/class/societe.class.php
 2018-02-20 15:06:41 +01:00
Laurent Destailleur
67ee443b34 Fix can set holiday remaining to 0 2018-02-20 14:53:19 +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
af1028576d Fix on search all (trim search + search from smartphone). 2017-12-12 11:31:30 +01:00
Laurent Destailleur
340287f073 FIX #7903 
Conflicts:
	htdocs/holiday/class/holiday.class.php
 2017-12-05 11:56:32 +01:00
Laurent Destailleur
22d61426a1 FIX #7903 2017-12-05 11:53:19 +01:00
Laurent Destailleur
0a73daba01 Security: on target=_blank, we must have rel="noopener" 2017-12-02 03:04:52 +01:00
Laurent Destailleur
c2f84309db
Update holiday.class.php 2017-11-24 16:38:52 +01:00
atm-quentin
314c30f489 FIX too much users on holiday list 2017-11-23 14:26:26 +01:00
Laurent Destailleur
f68b2bdeca Use the confirmation when deleting from mass action everywhere. 2017-11-15 11:39:11 +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
d1860b87f8 NEW Add a confirmation for all mass action 'delete' 2017-11-11 16:34:11 +01:00
Laurent Destailleur
1b28c45e2c PERF Links in getNomUrl use only one tag a instead of 2. 2017-11-02 15:19:14 +01:00
Laurent Destailleur
202712be94 Work on module builder 2017-10-25 22:02:07 +02:00
Laurent Destailleur
19a5780f7f Clean code 2017-10-20 23:49:20 +02:00
Laurent Destailleur
d82af57b57 NEW Add tab "Expense report" on user card 2017-10-19 20:56:23 +02:00
Scrutinizer Auto-Fixer
328d39bc71 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2017-10-07 11:09:31 +00:00
Laurent Destailleur
73f5d21ff8 Add button to make a leave request on the "leave" tab of user. 2017-10-06 12:36:11 +02:00
Laurent Destailleur
801a5180d6 Fix scrutinizer bug reports 2017-10-06 01:16:19 +02:00
Frédéric FRANCE
69314e08ac can't clean search_type in holiday list 2017-10-04 10:12:51 +02:00
Laurent Destailleur
12ec00428f Merge branch 'develop' into develop_bug 2017-10-03 16:24:44 +02:00
Laurent Destailleur
64fcbfffb1 Fix PHPCS 2017-10-03 16:05:15 +02: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
c4b3dc40c3 Allow : into file names 2017-10-03 10:54:51 +02:00
Regis Houssin
32e3845667 Fix: travis error 2017-10-03 10:08:25 +02:00
Laurent Destailleur
26564cc79c Allow : into file names 2017-10-02 20:38:15 +02:00
Laurent Destailleur
46698192b4 NEW Bulk delete actions available on leave requests 2017-10-02 20:32:31 +02:00
Laurent Destailleur
20b91a8d5f Fix type of leave request not visible in list 2017-10-02 19:36:54 +02:00
Laurent Destailleur
fea5746618 Standardize look and feel on leave request module 2017-10-02 18:17:16 +02:00
Laurent Destailleur
97d399595f Add unique key on table to follow leave request counter per type 2017-10-02 17:45:01 +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
2a04d497da Use a different css into timespent entry page when user is on holiday 2017-09-19 16:40:55 +02:00
Laurent Destailleur
8773a6860f Fix HTML5 use of <br> is preferred to <br /> 2017-09-15 23:49:04 +02:00
Laurent Destailleur
5e34b121dd Add more robust php unit to detect not escaped sql. Fix not escaped sql 2017-09-15 15:41:07 +02:00
Laurent Destailleur
0873260b8a USe second parameter in GETPOST 2017-09-15 10:50:50 +02:00
Laurent Destailleur
ee32cce33a Fix error reported by scrutinizer 2017-09-04 12:23:44 +02:00
Laurent Destailleur
044feab00f Fix duplicate code 2017-08-29 17:52:10 +02:00
Laurent Destailleur
5b1f5b0f20 Fix translation done twice into field title of array 2017-08-02 13:31:53 +02:00
Laurent Destailleur
19ba90f577 Fix creation of leave request 2017-08-01 13:17:27 +02:00
Laurent Destailleur
2870798d07 Fix remove warnings 2017-07-13 00:35:10 +02:00
Laurent Destailleur
f40afcf023 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
	htdocs/compta/facture/list.php
	htdocs/compta/paiement/class/cpaiement.class.php
	htdocs/compta/sociales/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/expensereport/card.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/product/stats/facture.php
 2017-07-08 18:32:34 +02:00
Laurent Destailleur
b7af0cca63 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/holiday/card.php
 2017-07-07 19:39:57 +02:00
Laurent Destailleur
4c1b485d47 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/compta/facture/list.php
 2017-07-07 19:06:25 +02:00
Alexandre SPANGARO
0797323664 Fix: Search broken in holiday list 2017-07-07 06:42:29 +02:00
arnaud
a695fa9c6e FIX holidays with postgresql like on rowid integer 2017-06-29 14:36:10 +02:00
fmarcet
4283b1ee30 FIX: User id correction on holiday request 2017-06-28 18:31:37 +02:00
Laurent Destailleur
c89e2eb7ea Fix pagination 2017-06-22 15:31:07 +02:00
Laurent Destailleur
5ed8340d0e Fix no record found into lists 2017-06-22 15:22:44 +02:00
fmarcet
c4546b6da6 FIX: User id correction on holiday request 2017-06-19 16:23:44 +02:00
Ferran Marcet
03eadcebf1 FIX: User id correction on holiday request 2017-06-19 12:25:00 +02:00
Laurent Destailleur
996ec4926b Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/core/lib/files.lib.php
	htdocs/don/card.php
 2017-06-18 22:16:34 +02:00
Laurent Destailleur
8debefa8ad Fix php sanitazing 2017-06-18 21:53:06 +02:00
Laurent Destailleur
86a6a83647 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/admin/tools/index.php
	htdocs/bookmarks/bookmarks.lib.php
	htdocs/compta/facture.php
	htdocs/core/tpl/passwordforgotten.tpl.php
	htdocs/fourn/ajax/getSupplierPrices.php
	htdocs/main.inc.php
	htdocs/product/stats/card.php
	htdocs/public/paypal/paymentko.php
 2017-06-18 21:13:48 +02:00
Laurent Destailleur
abe736c6a6 Escape hml tags 2017-06-18 19:42:59 +02:00
Laurent Destailleur
1b56e4a01c Fix look and feel v6 2017-06-14 11:28:42 +02:00
Laurent Destailleur
c8856182a6 Fix look and feel v6 2017-06-13 15:34:18 +02:00
Laurent Destailleur
a74d008ff2 Fix missing translation 2017-06-10 22:57:25 +02:00
Laurent Destailleur
7587a3d592 Merge branch 'develop' into develop_transverse 2017-06-08 10:25:04 +02:00
Regis Houssin
bfd6116e5b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc 2017-06-06 15:03:36 +02:00
Regis Houssin
03df365eea Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_transverse 2017-06-06 11:01:42 +02:00
Laurent Destailleur
02b5d9e6f7 FIX #6945 2017-06-06 10:53:53 +02:00
Regis Houssin
b66da3d148 New: big refactorization of multicompany transverse mode 2017-06-06 10:23:33 +02:00
Regis Houssin
2df33d1df3 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_mc
 2017-06-03 11:45:15 +02:00
Laurent Destailleur
c9a09adf79 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/main.lang
 2017-05-31 12:50:29 +02:00
Laurent Destailleur
5d115bcf69 Fix deadlock feature, can't process a leave request when validator has 
left company.
 2017-05-30 20:58:32 +02:00
Regis Houssin
5c5663c5ae New: getEntity function use true $shared value by default 2017-05-30 18:50:54 +02:00
KHELIFA
3402718425 Core Holiday: Add triggers for create, update and delete a holiday 
Fix the user parameter in the call of the create, update and delete functions of the class Holiday
 2017-05-29 11:58:16 +02:00
Laurent Destailleur
b3dc73e611 Look and feel v6 2017-05-21 02:43:51 +02:00
Laurent Destailleur
7dbe3b1da9 Merge pull request #6843 from aspangaro/6.0-multijournal 
Fix : Sql error on salaries index for accountancy multijournal + debug
 2017-05-18 17:45:21 +02:00
Laurent Destailleur
68e333879f Fix var not sanitized 2017-05-16 13:27:32 +02:00
Alexandre SPANGARO
93554b7e30 Typo searchpicto 2017-05-14 21:06:33 +02:00
Laurent Destailleur
fa290c34fa Fix against SQL injection. Add phpunit to detect missing escapement. 2017-05-12 16:55:11 +02:00
Laurent Destailleur
e5c898e0d6 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	build/makepack-dolibarr.pl
	htdocs/fichinter/list.php
	htdocs/product/list.php
	htdocs/projet/tasks/list.php
 2017-05-10 00:48:27 +02:00
Laurent Destailleur
6d01bd712d FIX Better sanitizing of search all parameter. 2017-05-09 19:36:10 +02:00
Laurent Destailleur
44bdf91715 Add badge with nb of imported calendard on user tab 2017-05-06 12:43:45 +02:00
Laurent Destailleur
d53654e64f Look and feel v6 2017-05-05 20:45:06 +02:00
Laurent Destailleur
39ebaec064 Replace usage of $bc[$var] with class="oddeven" 2017-04-14 11:22:48 +02:00
Laurent Destailleur
26a9999fbf Support of preview for pdf with several pages 2017-04-12 11:38:55 +02:00
Laurent Destailleur
be439f6252 Work on look and feel v6 2017-04-07 16:16:44 +02:00
Laurent Destailleur
0838953ef7 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-03-27 00:49:24 +02:00
Alexandre SPANGARO
10b7712965 Fix : Display of textarea in holiday card 2017-03-25 07:26:26 +01:00
Laurent Destailleur
0a35d17207 CSS enhancement 2017-03-23 10:59:13 +01:00
Laurent Destailleur
25df6b799a Fix loading lang 2017-01-23 17:36:50 +01:00
Laurent Destailleur
f875597c0b Fix statistics of leave requests (date valid not defined if status is 
draft)
 2017-01-22 16:03:08 +01:00
Laurent Destailleur
f36dea5be7 Fix holiday class 
Conflicts:
	htdocs/holiday/class/holiday.class.php
 2017-01-16 09:32:04 +01:00
Laurent Destailleur
ac80d4057d Fix several running time errors 2017-01-16 09:30:28 +01:00
Laurent Destailleur
1307b93d55 Normalize code 2016-12-22 16:09:12 +01:00
Laurent Destailleur
9f0528f5f1 Complete work on dol_banner 2016-12-14 00:06:50 +01:00
Laurent Destailleur
7600a10f2d FIX #6156 2016-12-12 12:33:43 +01:00
Laurent Destailleur
7077b4931c Add dump v5 2016-12-12 11:57:50 +01:00
Laurent Destailleur
6c4f15df63 Fix lot of fix in css look to match v5 rules. 2016-12-11 16:11:42 +01:00
Laurent Destailleur
ccba387691 Fix Responsive design 2016-11-27 20:18:10 +01:00
Laurent Destailleur
2c9edd4205 Maxi debug on list. Fix responsive design. 2016-11-27 13:49:46 +01:00
Laurent Destailleur
5acd09b2d5 Fix require_once instead of require. 2016-11-24 17:03:18 +01:00
Laurent Destailleur
d27dea8320 NEW Can rename uploaded or generated files on all "documents" tabs. 2016-10-14 18:09:24 +02:00
Laurent Destailleur
46f2f154c2 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-10-04 19:47:45 +02:00
Laurent Destailleur
4f27ee4018 Add log 2016-10-03 12:40:04 +02:00
Laurent Destailleur
0debcf745a Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/cron/card.php
	htdocs/cron/list.php
	htdocs/filefunc.inc.php
 2016-09-09 09:32:14 +02:00
Laurent Destailleur
efde12b489 Fix minor css 2016-09-09 09:21:27 +02:00
Laurent Destailleur
7d056f6857 NEW Use small photo of user on all user links 2016-09-01 11:29:30 +02:00
Laurent Destailleur
b267402df6 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/main.lang
	htdocs/societe/rib.php
 2016-08-01 15:15:32 +02:00
aspangaro
26f98a2ab7 Presentation 2016-08-01 06:45:29 +02:00
Laurent Destailleur
23753d849c FIX Data not lost when error during creation of leave request. 
Conflicts:
	htdocs/holiday/define_holiday.php
 2016-07-24 22:20:21 +02:00
Laurent Destailleur
02c573b3cc NEW Can filter on type of leave requests in list 2016-07-23 11:18:22 +02:00
Laurent Destailleur
9b8a710976 FIX Data not lost when error during creation of leave request. 2016-07-23 11:10:08 +02:00
Laurent Destailleur
9c89bc4095 Remove deprecated tables and code 2016-07-23 10:57:27 +02:00
Laurent Destailleur
4b854fb33d Fix better error message when possible refering objects list is empty. 2016-07-16 14:37:35 +02:00
Laurent Destailleur
258662e616 Fix: missing month of update in leave "view log" page. 2016-07-14 15:31:56 +02:00
Laurent Destailleur
93c9e81c33 Fix better size on list 2016-07-09 12:05:09 +02:00
Laurent Destailleur
0e7889a68c Fix must show label of leave type and not id. 2016-07-01 17:53:16 +02:00
Laurent Destailleur
10f2d7cd67 Fix Debug and minor fixes 2016-06-20 10:54:02 +02:00
Laurent Destailleur
9c3b9a8494 NEW: Link on user in leave context reach to leave tab. 2016-05-19 13:25:16 +02:00
Laurent Destailleur
e7072185ab Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/comm/propal.php
 2016-05-18 20:47:57 +02:00
Juanjo Menent
21b639ef16 Fix issues with entity control 2016-05-14 00:47:46 +02:00
Laurent Destailleur
1a883d870b Uniformize style 2016-04-23 17:35:33 +02:00
Scrutinizer Auto-Fixer
051ccf30a1 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2016-04-09 17:32:05 +00:00
Laurent Destailleur
c2fc9ecf68 Fix scrutinizer warning 2016-04-09 16:12:53 +02:00
Laurent Destailleur
e1bec46a34 FIX The include file for action on files should not be a template file 
but an action include file.
 2016-04-02 14:16:16 +02:00
Laurent Destailleur
91caea5707 Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +01:00
Laurent Destailleur
630f5a632d Revert "Corrected non-static usages of Form::selectarray function" 
This reverts commit 87cd6e1e40.
 2016-03-25 15:34:37 +01:00
Marcos García de La Fuente
89bd173c2f NEW Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate 2016-03-21 21:51:29 +01:00
Marcos García de La Fuente
5a046125db Missing changes from previous commits 2016-03-20 14:24:49 +01:00
Marcos García de La Fuente
87cd6e1e40 Corrected non-static usages of Form::selectarray function 2016-03-20 14:15:17 +01:00
Laurent Destailleur
77ae5c668a Can see rest of available leaves request in read only mode if we don't 
have permission to edit.
 2016-03-14 21:31:22 +01:00
Laurent Destailleur
d4c6c4c140 NEW Holiday is a RH module. All RH module provides by default visilibity 
on users of its hierarchy.
 2016-03-14 21:22:49 +01:00
Laurent Destailleur
09a29322c3 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/supplier/list.php
	htdocs/commande/orderstoinvoice.php
	htdocs/public/demo/index.php
	htdocs/societe/commerciaux.php
 2016-03-08 17:40:21 +01:00
Regis Houssin
25686e82c9 Fix: best compatibility with multicompany and others security issue 2016-03-03 08:49:24 +01:00
Laurent Destailleur
9da0164d90 Uniformize code for lists 2016-02-07 15:50:48 +01:00
Laurent Destailleur
dbaa43f3be Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/holiday/card.php
	htdocs/holiday/list.php
	htdocs/user/card.php
 2016-01-23 11:45:39 +01:00
Laurent Destailleur
3903ced5b4 Fix: link to add at wrong place 2016-01-23 11:30:06 +01:00
Laurent Destailleur
627f606c4d Fix list of leave request was not showing label correctly. 2016-01-23 11:17:20 +01:00
Laurent Destailleur
2b96c8f205 FIX Noway to validate a leave request for some uer even if they have 
permission for.
 2016-01-23 11:05:06 +01:00
Laurent Destailleur
bf09800540 Fix function signature 2016-01-10 18:52:26 +01:00
Laurent Destailleur
aa0b002119 Fix #4354 2016-01-10 11:35:06 +01:00
Laurent Destailleur
fddd02eecc Complete fix #4354 2016-01-10 11:31:22 +01:00