2
0
forked from Wavyzz/dolibarr
Commit Graph

100736 Commits

Author SHA1 Message Date
fr69400
d485d9d2fd Update note.php 2021-07-11 09:45:59 +02:00
fr69400
c7ad0a59c9 Update note.php 2021-07-11 09:45:38 +02:00
fr69400
a27b0cd797 Update note.php 2021-07-11 09:45:22 +02:00
stickler-ci
cc4defd212 Fixing style errors. 2021-07-11 07:44:41 +00:00
fr69400
bf03a30a9f Update note.php 2021-07-11 09:44:18 +02:00
fr69400
dafd0fb4b0 Update bom_note.php 2021-07-11 09:44:01 +02:00
stickler-ci
698f6db72e Fixing style errors. 2021-07-11 07:43:34 +00:00
fr69400
b8fd4394a1 Update note.php 2021-07-11 09:43:08 +02:00
stickler-ci
c7e6f66823 Fixing style errors. 2021-07-11 07:43:02 +00:00
fr69400
5ec903723d Update note.php 2021-07-11 09:42:35 +02:00
stickler-ci
4272f93aa4 Fixing style errors. 2021-07-09 16:41:41 +00:00
fr69400
e45d5c1d0d NEW add hookmanager on note pages 2021-07-09 18:36:21 +02:00
Laurent Destailleur
1a63a379cc Fix missing permission 2021-07-01 03:03:59 +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
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
5c6ccfd3a6 Merge pull request #18051 from altairisfr/timespent2inter
NEW generate intervention from time spent
2021-06-30 14:52:16 +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
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
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