Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-09 02:58:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
101,561 Commits 36 Branches 190 Tags
b1cba14718f901b459681a56ee7a9f58ffdd18ab
Commit Graph

24972 Commits

Author SHA1 Message Date
Laurent Destailleur
b43fddfc74 Merge pull request #18058 from altairisfr/exportprices 
add labels and export only latest prices
 2021-07-02 16:35:58 +02:00
Laurent Destailleur
dbd2d2eb20 Merge pull request #18069 from marc-dll/13.0_FIX_holiday_menus 
FIX: holiday: status filter parameter has been renamed but not in links it was used
 2021-07-02 16:35:14 +02:00
Laurent Destailleur
6ae1d192e4 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/compta/facture/card.php
 2021-07-02 16:14:12 +02:00
Marc de Lima Lucio
97938f489e FIX: holiday: status filter parameter has been renamed but not in links it was used 2021-07-02 11:35:26 +02:00
Théo David
079608fe00 NEW #18046 Add ticket ticket categories functions 2021-07-02 10:26:03 +02:00
Frédéric FRANCE
3aa24cccff fix can't remove extrafield date or datetime value 2021-07-01 15:15:35 +02:00
Laurent Destailleur
9392624e54 Fix deletion of line on replacement invoice 2021-07-01 13:36:04 +02:00
Laurent Destailleur
5b34ea6c22 FIX permission to close a proposal when using advanced permissions 2021-07-01 03:06:40 +02:00
Laurent Destailleur
4cff865c6b Trans 2021-06-30 18:22:40 +02:00
Laurent Destailleur
bf7f8f7c45 Fix phpcs 2021-06-30 17:28:23 +02:00
Laurent Destailleur
aec4d6016c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-30 17:27:40 +02:00
Laurent Destailleur
6cb5ea6ec2 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-30 17:27:20 +02:00
Laurent Destailleur
bda36337cd Prepare fix #yogosha6443 2021-06-30 17:22:36 +02:00
Christophe Battarel
ac6cb5853e fix for multientity 2021-06-30 15:35:55 +02:00
Laurent Destailleur
7c2121c439 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/tpl/objectline_edit.tpl.php
 2021-06-30 15:06:16 +02:00
Laurent Destailleur
068622bced Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-06-30 15:00:23 +02:00
Laurent Destailleur
a914ffa42c CSS 2021-06-30 15:00:04 +02:00
Laurent Destailleur
b6a538f439 Merge pull request #18056 from aspangaro/14b16 
FIX Accountancy - Clean virtual zero on the import
 2021-06-30 14:44:12 +02:00
Laurent Destailleur
51456741d9 FIX Can't edit replacement invoice 
FIX Status of invoice when making a replacement invoice
 2021-06-30 12:43:44 +02:00
Christophe Battarel
3b4ea5c5af use formintervention 2021-06-30 10:56:09 +02:00
Christophe Battarel
27e2c62cab Merge branch 'develop' into timespent2inter 2021-06-30 10:34:22 +02:00
Christophe Battarel
4f2e579bb2 add labels and export only latest prices 2021-06-30 10:21:31 +02:00
Christophe Battarel
0b5e231dd5 add labels and export only latest prices 2021-06-30 10:18:14 +02:00
Florian Mortgat
5d4c40fffa Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_develop_addFileIntoDatabaseIndex_facilitate_setting_description_and_keyword 2021-06-30 09:36:34 +02:00
Florian Mortgat
94416072d8 FIX after PR feedback: remove uses of keyword attribute of EcmFiles (use keywords instead) 2021-06-30 09:34:49 +02:00
Alexandre SPANGARO
f95b5be971 FIX Accountancy - Clean virtual zero on the import 2021-06-30 04:55:22 +02:00
Alexandre SPANGARO
6f12812329 FIX Accountancy - Clean virtual zero on the import 2021-06-29 23:07:20 +02:00
Laurent Destailleur
02a5755876 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/langs/nl_NL/main.lang
 2021-06-29 19:59:51 +02:00
Laurent Destailleur
6196a77e64 Merge pull request #17861 from marc-dll/develop_NEW_project_block_timesheet 
NEW: project time spent: conf to prevent recording time after X months
 2021-06-29 19:53:20 +02:00
Laurent Destailleur
c7befd9acc Fix php8 (related to #18019) 2021-06-29 19:49:37 +02:00
Laurent Destailleur
eab6fc9347 Merge pull request #18053 from fappels/14_fix_php8_part2 
Fix php8 warning
 2021-06-29 19:17:09 +02:00
Laurent Destailleur
2860e12b65 Update objectline_view.tpl.php 2021-06-29 19:16:29 +02:00
Laurent Destailleur
0f020d5b20 Fix for phpv8 2021-06-29 19:05:18 +02:00
Laurent Destailleur
7aeb652c66 Better sanitizing, fix phpcs 2021-06-29 18:22:36 +02:00
Laurent Destailleur
796b2d201a Enhance the sanitizing. 2021-06-29 18:17:27 +02:00
Francis Appels
1b7b45d72a Merge remote-tracking branch 'Dolibarr/14.0' into 14_fix_php8_part2 2021-06-29 16:56:48 +02:00
Francis Appels
051bb3f3ef Fix some core php8 warnings. 
Fixing php 8 warnings seems also to solve some situations like a paiment condition removed from dictionary can not be selected.
 2021-06-29 16:37:07 +02:00
lmarcouiller
3d41c00199 New : selectGroupTicket multilevel >1 level 2021-06-29 16:13:03 +02:00
Laurent Destailleur
25c6b64b1e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/modules/delivery/doc/pdf_storm.modules.php
	htdocs/core/modules/reception/doc/pdf_squille.modules.php
	htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
	htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
 2021-06-29 15:58:26 +02:00
Christophe Battarel
c8f55907eb stickler 2021-06-29 15:52:50 +02:00
Laurent Destailleur
1cf3408f5b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/contact/class/contact.class.php
 2021-06-29 15:52:39 +02:00
Christophe Battarel
d423e47d3b stickler 2021-06-29 15:50:41 +02:00
Laurent Destailleur
ba4a01dbea Merge pull request #18037 from atm-maxime/fix_mo_stuff 
Fix MO and BOM links in boxes
 2021-06-29 15:42:09 +02:00
Laurent Destailleur
ab4dbcf5ae Update box_mos.php 2021-06-29 15:41:48 +02:00
Laurent Destailleur
474df5fef2 Update box_boms.php 2021-06-29 15:41:21 +02:00
Christophe Battarel
ef8aaa7fd7 generate intervention from time spent 2021-06-29 15:26:04 +02:00
Laurent Destailleur
69e0381e55 Prepare v14 2021-06-29 02:39:20 +02:00
Francis Appels
9b59f264fd Fix some php 8 warning 2021-06-28 20:00:10 +02:00
Laurent Destailleur
2e2d9002ad Code comment 2021-06-27 14:54:17 +02:00
Maxime Kohlhaas
8332385bd5 Fix links in box last BOM 2021-06-27 08:42:08 +02:00