Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
103,106 Commits 36 Branches 189 Tags
901bab2ca2608559d8865800e8768fc24c29fde4
Commit Graph

25468 Commits

Author SHA1 Message Date
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
Maxime Kohlhaas
d86caa39e4 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into fix_mo_stuff 2021-06-27 08:34:11 +02:00
Laurent Destailleur
4ff2ff779b css 2021-06-26 16:35:33 +02:00
Laurent Destailleur
b3b96ddb7a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-26 16:11:13 +02:00
Laurent Destailleur
bbc6b9aa1b Look and feel v14 2021-06-26 16:10:56 +02:00
Laurent Destailleur
e62ed28701 Debug v14 2021-06-26 15:39:52 +02:00
Laurent Destailleur
f4a512fa7b Merge pull request #18004 from OPEN-DSI/new-export-parent-compnay-document-lines 
NEW parent company on exports
 2021-06-26 12:30:57 +02:00
Laurent Destailleur
97f5a0e541 Merge pull request #18018 from frederic34/patch-7 
export value of checkbox instead id with EXPORT_LABEL_FOR_SELECT
 2021-06-26 12:24:01 +02:00
Laurent Destailleur
781df5a8a8 Merge pull request #18016 from fappels/13_fix_klaas 
FIX #17919 pictures in docs.
 2021-06-26 12:22:57 +02:00
Laurent Destailleur
012f326168 Merge pull request #18020 from Hystepik/develop#1 
Fix : error display fr phone number
 2021-06-26 12:18:16 +02:00
Laurent Destailleur
2fd47615eb Fix load of conf when using alternative $db 2021-06-26 01:46:14 +02:00
Laurent Destailleur
6e3647af2c Debug v14 2021-06-26 00:08:19 +02:00
Laurent Destailleur
c7b03da7e6 Fix bad object used 2021-06-25 23:43:22 +02:00
lvessiller
2cb2ec02d6 NEW parent compnay in order supplier lines export 2021-06-25 17:04:19 +02:00
Francis Appels
ec805d36fe Remove deprecated level parameter. 2021-06-25 10:02:23 +02:00
lmarcouiller
98244a5e44 Fix : error display fr phone number 2021-06-24 14:20:19 +02:00
Francis Appels
88f7ca9214 Fix MAIN_GENERATE_RECEPTION_WITH_PICTURE 2021-06-24 12:27:39 +02:00
Laurent Destailleur
cfc5646059 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-24 12:18:30 +02:00
Laurent Destailleur
a2d451dbfb Missing extrafield on report 2021-06-24 12:17:32 +02:00
Francis Appels
dc9e71084b Fix missing posYAfterImage for nexy for espadon and squille 2021-06-24 12:15:29 +02:00
Frédéric FRANCE
47b1d2b7df export value of checkbox instead id with EXPORT_LABEL_FOR_SELECT 2021-06-24 11:54:05 +02:00
Florian Mortgat
d0a4ae88b1 NEW: make it easier to set the keyword, keywords and description attributes of an ecm file object 2021-06-24 11:50:34 +02:00