Commit Graph

101 Commits

Author SHA1 Message Date
Yannis Hoareau
42089e3542 New: add configuration to choose if holiday are updated at the end of month (#29438)
* New setting for holiday updates

* FIX: holidays accounting at the end of taken month: log consumption for every request + update translations

* FIX: holidays accounting at the end of taken month: update conf name

* FIX: holidays accounting at the end of taken month: refactor monthly cron update

* FIX: holidays accounting at the end of taken month: update conf translation

* FIX: holidays accounting at the end of taken month: initialize holiday array + delete duplicate code

* New setting for holiday updates

* FIX: holidays accounting at the end of taken month: log consumption for every request + update translations

* FIX: holidays accounting at the end of taken month: update conf name

* FIX: holidays accounting at the end of taken month: refactor monthly cron update

* FIX: holidays accounting at the end of taken month: update conf translation

* FIX: holidays accounting at the end of taken month: initialize holiday array + delete duplicate code

* FIX: holidays accounting at the end of taken month: clean code

* FIX: holidays accounting at the end of taken month: empty now used on variables

* FIX: holidays accounting at the end of taken month: resolve not casted var in sql request

* FIX: holidays accounting at the end of taken month: now using only dolibarr functions

* FIX: holidays accounting at the end of taken month: fix php-stan and rework casting to int

* FIX: holidays accounting at the end of taken month: fix php-stan and rework casting to int (2)

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
Co-authored-by: Yannis Hoareau <93135242+JustRaosha@users.noreply.github.com>
2024-10-10 00:13:36 +02:00
Laurent Destailleur
4d64b89c9a Sync transifex 2024-10-01 10:40:12 +02:00
Laurent Destailleur
6f9be540e6 Typo 2024-10-01 10:34:25 +02:00
Laurent Destailleur
073facfee5 Trans 2024-09-23 12:18:47 +02:00
Laurent Destailleur
c443bd4a3d Fix duplicate key entries 2024-01-22 14:13:31 +01:00
Laurent Destailleur
a999abfac2 Increase width of left menu 2024-01-06 16:55:38 +01:00
Laurent Destailleur
b3da4e1eeb Trans 2024-01-06 14:52:29 +01:00
MDW
9cb872c8d3 Fix spelling in base language (#26671) 2023-11-17 16:20:49 +01:00
Laurent Destailleur
e0ef2870a4 NEW: Add widget "The next upcoming events" 2023-05-05 13:42:38 +02:00
Laurent Destailleur
1be9364971 Look and feel v18 2023-03-30 19:47:48 +02:00
Laurent Destailleur
9db7daf449 Fix trans 2023-01-06 14:16:58 +01:00
lmarcouiller
9d1a4ede6e Close #22245 : new increase holiday massaction 2022-09-21 11:06:54 +02:00
lmarcouiller
c6349ce51a Fix : Yogosha report 12245 bad field verification 2022-09-06 11:06:48 +02:00
Frédéric FRANCE
ec764595f8 enhance bank display for user 2022-08-29 16:59:23 +02:00
Laurent Destailleur
533e4f2424 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/fr_FR/accountancy.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/cashdesk.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/fr_FR/members.lang
	htdocs/langs/fr_FR/products.lang
2022-08-12 16:03:09 +02:00
Laurent Destailleur
0d68c0ba14 Debug v16 2022-08-12 15:07:15 +02:00
Laurent Destailleur
67d17cf289 Trans 2022-07-07 22:50:42 +02:00
jpb
0e72085be6 add trads on form fields 2022-06-13 08:36:17 +02:00
jpb
02a4e10fd3 add todo for some jquery 2022-06-07 19:12:40 +02:00
jpb
c434e9cffe add card and feature 2022-06-07 19:01:57 +02:00
Laurent Destailleur
494e9a2745 Merge branch 'develop' into develop_NEW_block_leave_if_negative_balance 2021-12-16 19:12:06 +01:00
Laurent Destailleur
a298a845f1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/memory.lib.php
	htdocs/langs/en_US/holiday.lang
	htdocs/ticket/card.php
2021-11-30 16:24:18 +01:00
Laurent Destailleur
3de3adad74 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/ajax/objectonoff.php
2021-11-30 16:11:12 +01:00
Marc de Lima Lucio
1361abffe5 FIX: holiday list: only mass delete if leave request is not in draft, canceled or refused, like in card 2021-11-26 18:22:31 +01:00
Laurent Destailleur
47dd7335a9 Debug v15 2021-11-10 21:34:41 +01:00
Marc de Lima Lucio
5f826f78a1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_NEW_block_leave_if_negative_balance 2021-09-30 17:41:38 +02:00
Laurent Destailleur
047bbbb298 NEW Can set/unset the usual working day of the week 2021-08-05 14:42:28 +02:00
Marc de Lima Lucio
30e0471451 NEW: leave requests: add field into type dictionary to block request if balance is negative 2021-06-10 23:04:56 +02:00
Marc de Lima Lucio
1e7df0ba9f NEW: holiday: handle monthly updates with cronjob 2021-06-10 21:53:06 +02:00
Laurent Destailleur
83df996bc2 Fix english translation 2021-03-05 09:52:25 +01:00
Laurent Destailleur
4819e58d06 Fix trans 2020-07-04 13:04:53 +02:00
Laurent Destailleur
3bd95c205d Tooltip to understand the new dictionary of holidays 2020-01-15 14:54:17 +01:00
Laurent Destailleur
141ca20269 Trans 2020-01-15 14:44:53 +01:00
Laurent Destailleur
4fc7b8c3b1 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/tpl/extrafields_list_search_title.tpl.php
2019-11-14 12:49:42 +01:00
Laurent Destailleur
a29adc94f3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/comm/card.php
	htdocs/langs/en_US/admin.lang
2019-11-14 12:48:33 +01:00
Alexandre SPANGARO
0497c399d7 Missing language key 2019-11-13 14:59:07 +01:00
Laurent Destailleur
7b3e64d67f NEW Support of Extrafields on Leave requests. 2019-09-24 12:01:18 +02:00
Laurent Destailleur
bb893fd3a8 FIX Missing the filter fields in export of expense report and leaves 2019-08-27 18:16:34 +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
ea4dcbc77a Add translation 2019-05-18 17:07:55 +02:00
torvista
351274d85d 1) Standardization of use of "third party"
as a noun : third party
as an modifier: third-party contact
2) use of colons: no space before
3) Use of supplier/vendor was mixed.
Vendor is B2B or B2C, supplier is B2B. Changed all references to supplier.
4) Many minor grammar changes.
2018-12-11 10:08:19 +01:00
Laurent Destailleur
0367795488 Fix auto jump on record if only 1 record in a search 2018-11-27 11:09:47 +01:00
Laurent Destailleur
8b601bd7fd Fix numbering of holidays 2018-10-25 18:50:53 +02:00
Laurent Destailleur
8a928a72fa Sync transifex 2018-10-13 14:03:32 +02:00
Steve
e45e74a3bd spelling and some grammar corrections to en_US 2018-07-09 17:38:28 +02: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
0c45760dd4 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/install/step5.php
	htdocs/langs/en_US/holiday.lang
	htdocs/public/payment/newpayment.php
	htdocs/public/stripe/newpayment.php
2018-03-19 17:58:19 +01:00
Laurent Destailleur
eb03fb7540 Fix trad/compatibility 2018-03-19 15:00:50 +01:00