Commit Graph

101146 Commits

Author SHA1 Message Date
netdrag
6cfd8c6f24
Order Supplier Email Sender Extension
Extended the advanced options to specify an email address for the order supplier. Useful if you operate under a brand, but order under a different.
2021-07-22 18:38:22 +02:00
Laurent Destailleur
afa6ced6c9 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/main.inc.php
2021-07-21 01:29:22 +02:00
Laurent Destailleur
23f708c0d4 Fix phpcs 2021-07-21 01:27:14 +02:00
Laurent Destailleur
dbed6bc0da Fix #yogosha6678 2021-07-21 01:18:48 +02:00
Laurent Destailleur
e02fbadcd7 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/main.inc.php
2021-07-21 00:41:40 +02:00
Laurent Destailleur
e4bb5ed008 Fix phpcs 2021-07-21 00:35:08 +02:00
Laurent Destailleur
c2f1781fae Fix #huntr5bb5a52-3b1c-40ad-9c64-61735f886736 2021-07-21 00:14:03 +02:00
Laurent Destailleur
219a2a860b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/main.lang
	htdocs/main.inc.php
2021-07-20 23:59:33 +02:00
Laurent Destailleur
dc7ff07517 Fix #huntr7144bb4b-338f-45f0-a70e-088ef1f4c037 2021-07-20 23:54:22 +02:00
Laurent Destailleur
08e06f9789 Fix #hunter2c606116-f212-49e0-967c-11f8666be43b 2021-07-20 23:28:57 +02:00
Laurent Destailleur
2383fd02c8 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-20 23:20:22 +02:00
Laurent Destailleur
0e18bd4be1 Fix #hunter2cd3fc73-65a1-4615-9143-9e7febd81a15 2021-07-20 23:15:31 +02:00
Laurent Destailleur
e25171b9f5 Fix phpcs 2021-07-20 23:03:19 +02:00
Laurent Destailleur
b57eb8284e Fix Improper Authorization Check reported by Ahsan Aziz. 2021-07-20 22:42:23 +02:00
Laurent Destailleur
cea35bd208 Fix pass was lost on error 2021-07-20 22:14:11 +02:00
Laurent Destailleur
c0d54fe608 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-16 15:03:52 +02:00
Laurent Destailleur
a344ae89f2 Fix changelog 2021-07-16 15:02:23 +02:00
Laurent Destailleur
0ccc2d9033 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-16 15:01:11 +02:00
Laurent Destailleur
af1c43c70d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/core/modules/modBarcode.class.php
	htdocs/fourn/class/fournisseur.commande.dispatch.class.php
2021-07-16 14:05:42 +02:00
Laurent Destailleur
2fc8a80070
Merge pull request #17883 from marc-dll/develop_NEW_holiday_cron
NEW: holiday: handle monthly balance updates with cronjob
2021-07-16 12:48:12 +02:00
Laurent Destailleur
f7ed6c8a0b
Merge pull request #18129 from evarisk-theo/add-ticket-categories-views
NEW: ticket categories views
2021-07-16 12:46:14 +02:00
Laurent Destailleur
501bc853af Fix default value 2021-07-16 12:44:15 +02:00
Laurent Destailleur
34c31492cf
Merge pull request #18161 from FHenry/13_fix_barecode_externaluser
fix: print barcode sould not be available for external user #18160
2021-07-16 12:38:32 +02:00
Laurent Destailleur
98b2d4c16e
Merge pull request #18158 from ATM-Consulting/FIX_13.0_inconsistent_triggers_in_reception_line_class
FIX 13.0: class CommandeFournisseurDispatch triggers
2021-07-16 12:38:03 +02:00
Marc de Lima Lucio
4d6372dda1 FIX: holiday balances: revert part of commit 1e7df0ba9 to still increment on page visit 2021-07-16 12:10:25 +02:00
Florian HENRY
c928de89c6 fix: print barcode sould not be available for external user 2021-07-16 10:41:06 +02:00
Florian Mortgat
180527d23a FIX 13.0: class CommandeFournisseurDispatch provides trigger for UPDATE but not for CREATE / DELETE 2021-07-16 10:10:57 +02:00
Laurent Destailleur
ce27feda84 Debug v14
Fix email collector (Creation of thirparty, set of extrafields)
2021-07-16 00:12:58 +02:00
Laurent Destailleur
0637ef781f Add samples for imap functions test 2021-07-15 23:03:24 +02:00
Laurent Destailleur
1e93a3f8f4 More log on imap card 2021-07-15 22:32:29 +02:00
Laurent Destailleur
0aeeb62628 More log on imap card 2021-07-15 22:29:03 +02:00
Laurent Destailleur
9aad07f20c Remove log 2021-07-15 21:57:32 +02:00
Laurent Destailleur
5da40d80f7 Fix css 2021-07-15 16:35:06 +02:00
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