Commit Graph

112767 Commits

Author SHA1 Message Date
Laurent Destailleur
83d931f3c7 FIX #18143 2021-07-14 17:40:36 +02:00
Laurent Destailleur
901a158238 Fix backward compatibility 2021-07-14 17:19:43 +02:00
Laurent Destailleur
fb8ecf10d9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-14 14:49:30 +02:00
Laurent Destailleur
638a66fbb9 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/main.lang
2021-07-14 14:49:06 +02:00
Laurent Destailleur
8b040ec8f2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-07-14 14:47:38 +02:00
Laurent Destailleur
a3526a2649 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/core/actions_addupdatedelete.inc.php
2021-07-14 14:46:05 +02:00
Laurent Destailleur
ebd9ce5c8d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/core/class/commonobject.class.php
2021-07-14 14:42:41 +02:00
Laurent Destailleur
a773652c04 Fix phpcs 2021-07-14 14:37:07 +02:00
Laurent Destailleur
b552c6b4fe Fix status color 2021-07-14 14:32:05 +02:00
Laurent Destailleur
ddf067e9de
Merge pull request #17801 from nicolas-eoxia/fix_process_payment_with_online_link_order
NEW : Auto create invoice for payment done on an order with online payment link of order
2021-07-14 14:05:13 +02:00
Laurent Destailleur
b2425c2a9d
Update paymentok.php 2021-07-14 14:04:44 +02:00
Laurent Destailleur
c818e39374
Merge pull request #18149 from defrance/patch-168
add interventional drafts on commercial index
2021-07-14 13:59:07 +02:00
Laurent Destailleur
0fd980b005
Update index.php 2021-07-14 13:57:17 +02:00
Laurent Destailleur
7281a51eff
Merge pull request #18148 from AlexisLaurier/fix/CommonObjectShowInputFieldCheckboxAndRadio
fix showInputField checkbox and radio type
2021-07-14 13:55:53 +02:00
Laurent Destailleur
a88ab8e443
Merge pull request #18147 from atm-john/fix_dialog_btn
Fix : dialog BTN and add doc
2021-07-14 13:53:41 +02:00
Laurent Destailleur
90fa36b46a
Merge pull request #18145 from atm-gauthier/12.0_fix_method_exists
FIX : method_exists needs object at first param
2021-07-14 13:52:03 +02:00
Laurent Destailleur
21f295565a
Merge pull request #18144 from Hystepik/develop#1
Fix : remove of a button which was forgotten
2021-07-14 13:50:42 +02:00
BENKE Charlene
7406f2cc85
a interventional drafts on commercial index 2021-07-14 12:55:33 +02:00
Alexis LAURIER
cd5e1d603e fix showInputField checkbox and radio type 2021-07-14 12:02:03 +02:00
Francis Appels
f4db643f37 Merge remote-tracking branch 'Dolibarr/14.0' into 14 2021-07-14 10:09:45 +02:00
ATM john
87c26ae0e2 Add php doc 2021-07-14 10:07:03 +02:00
Laurent Destailleur
7f2cdbf96e
Merge pull request #18128 from evarisk-theo/add-ticket-categories-functions
add: ticket categories functions
2021-07-14 02:21:13 +02:00
Laurent Destailleur
724d00fc6c Fix phpcs 2021-07-14 02:20:15 +02:00
ATM john
1a330e0b88 Fix dialog BTN and add doc 2021-07-14 00:02:55 +02:00
Gauthier PC portable 024
0fe46b53d8 FIX : method_exists needs object at first param 2021-07-13 15:18:40 +02:00
lmarcouiller
9a12b5e424 Fix : remove of a button which was forgotten 2021-07-13 15:17:01 +02:00
Laurent Destailleur
ba8d60f4d4 FIX amount of payment deleted in unalterable log (for old record must
look the log of creation to know amount).
2021-07-13 14:48:05 +02:00
Laurent Destailleur
b12aae4a99 FIX amount of payment deleted in unalterable log (for old record must
look the log of creation to know amount).
2021-07-13 14:26:32 +02:00
Laurent Destailleur
0d9cf07035 Show ref of invoice into tooltip 2021-07-13 14:07:35 +02:00
evarisk-theo
f0599095ee
Merge branch 'Dolibarr:develop' into add-ticket-categories-functions 2021-07-13 14:04:14 +02:00
Théo David
66f38d0012 fix: rename select_tickets_list into selectTicketsList 2021-07-13 14:00:16 +02:00
Laurent Destailleur
af99cab839 CSS 2021-07-13 13:46:20 +02:00
Laurent Destailleur
e755d68b06 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-13 13:22:20 +02:00
Laurent Destailleur
0d12f25341 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-13 13:21:50 +02:00
Laurent Destailleur
d1a00c26aa Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/core/class/hookmanager.class.php
	htdocs/core/lib/functions.lib.php
2021-07-13 13:14:27 +02:00
Laurent Destailleur
7a589921fe Fix #18142 2021-07-13 13:10:19 +02:00
Laurent Destailleur
4c29a3ad99 Fix migration 2021-07-13 13:06:28 +02:00
Laurent Destailleur
bbce0f9c1b
Update html.form.class.php 2021-07-13 13:01:34 +02:00
Laurent Destailleur
f1c7207514
Merge pull request #18135 from Hystepik/develop#1
Fix #18110 : update of formticket.class.php
2021-07-13 11:48:36 +02:00
Laurent Destailleur
e5ed5edeab
Merge pull request #18140 from Hystepik/develop#2
Close #18131 : new massaction for thirdparty
2021-07-13 11:45:47 +02:00
Laurent Destailleur
df3d88570c Fix missing column in migration 2021-07-13 11:39:08 +02:00
stickler-ci
85adefe721 Fixing style errors. 2021-07-13 08:08:01 +00:00
lmarcouiller
35b29481c7 Close #18131 : new massaction for thirdparty 2021-07-13 10:05:38 +02:00
Laurent Destailleur
f9d60b15d9 Fix phpcs 2021-07-12 23:56:42 +02:00
Laurent Destailleur
202ee8340a FIX #18091 2021-07-12 23:01:34 +02:00
Christophe Battarel
a15d895b4b fix badge status bgcolor 2021-07-12 17:00:42 +02:00
Laurent Destailleur
224bbe96c3
Merge pull request #18133 from altairisfr/fixbadge
fix badge status bgcolor
2021-07-12 17:00:12 +02:00
Laurent Destailleur
d3f324c2d4 Try a better fix for #18105 2021-07-12 16:55:16 +02:00
stickler-ci
5b1525e77c Fixing style errors. 2021-07-12 14:15:28 +00:00
lmarcouiller
cfb03f065c Fix #18110 : update of formticket.class.php 2021-07-12 16:12:28 +02:00