Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
112,767 Commits 35 Branches 179 Tags 1.7 GiB
e3a0220658
Commit Graph

112767 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
5c6ccfd3a6
Merge pull request #18051 from altairisfr/timespent2inter 
NEW generate intervention from time spent
 2021-06-30 14:52:16 +02:00
Laurent Destailleur
246f7b054e
Merge pull request #18060 from atm-arnaud/FIX_deposit_can_create_credit_note_in_payment_conf 
FIX deposit can create credit note in payment conf
 2021-06-30 14:48:29 +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
6ef42623da
Merge pull request #18059 from Hystepik/develop#1 
Fix php 8.0 errors
 2021-06-30 14:38:37 +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
atm-arnaud
8772c53723 FIX deposit can create credit note in payment conf 2021-06-30 12:37:21 +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
lmarcouiller
2ab97d522d Fix php 8.0 warning societe index 2021-06-30 10:30:46 +02:00
lmarcouiller
dcd4d53622 Fix php 8 warning in adherents list 2021-06-30 10:22:00 +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
Laurent Destailleur
94974af738 trans 2021-06-30 01:52:54 +02:00
Laurent Destailleur
5e37c2ef74 CSS 2021-06-30 01:36:49 +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
5f019e0857 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-29 19:57:06 +02:00
Laurent Destailleur
7d8770305a
Merge pull request #17790 from aspangaro/14b11 
NEW Add field date from/to in supplier payment list
 2021-06-29 19:54:41 +02:00
Laurent Destailleur
04148dd5fb
Merge pull request #17789 from aspangaro/14b10 
NEW Add field date from/to in customer payment list
 2021-06-29 19:54:12 +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
11b5c044bc
Merge pull request #18052 from Hystepik/develop#3 
New : selectGroupTicket  multilevel >1 level
 2021-06-29 19:37:39 +02:00
Laurent Destailleur
2a876d139b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-06-29 19:25:09 +02:00
Laurent Destailleur
1804c36a05
Merge pull request #18047 from aspangaro/14b16 
Uniformize accounting displays
 2021-06-29 19:24:57 +02:00
Laurent Destailleur
c74060d02c Fix lost change in merge 2021-06-29 19:24:46 +02:00
Laurent Destailleur
d59dfcb08a
Update list.php 2021-06-29 19:21:35 +02:00
Laurent Destailleur
d379151da6 Fix doc 2021-06-29 19:19:38 +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
56787bc292
Update card.php 2021-06-29 19:14:03 +02:00
Laurent Destailleur
0f020d5b20 Fix for phpv8 2021-06-29 19:05:18 +02:00
Laurent Destailleur
0577229a8b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-06-29 18:22:53 +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
Laurent Destailleur
0d7fccc7b3 Fix test 2021-06-29 16:33:53 +02:00
Francis Appels
e4f61d430f Invoice php 8 issue and warnings. 
Seems if ("" < 0) is true in php 8
 2021-06-29 16:33:24 +02:00
Francis Appels
b8f5dc74d7 Some order php 8 warning 2021-06-29 16:30:36 +02:00
Francis Appels
b83f57da48 Fix some proposal php 8 warning 2021-06-29 16:26:48 +02:00
lmarcouiller
3d41c00199 New : selectGroupTicket multilevel >1 level 2021-06-29 16:13:03 +02:00
Laurent Destailleur
9236d38821
Merge pull request #18035 from frederic34/patch-7 
fix php warning
 2021-06-29 16:03:11 +02:00
Laurent Destailleur
1982ab47ac
Merge branch '14.0' into patch-7 2021-06-29 16:02:47 +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
Laurent Destailleur
24fccc2b72 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-06-29 15:53:22 +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