Commit Graph

101367 Commits

Author SHA1 Message Date
Laurent Destailleur
78358d4ea1
Merge pull request #18190 from frederic34/migration_cat_tickets
add categories tickets migration
2021-08-03 17:13:06 +02:00
Laurent Destailleur
5becf13f2b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-03 17:09:09 +02:00
Laurent Destailleur
ede571dcfe Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/filefunc.inc.php
2021-08-03 17:08:49 +02:00
Laurent Destailleur
d3fa85cdb4
Merge pull request #18324 from Hystepik/develop#4
Close #18043 : fk_user_assign in create ticket
2021-08-03 17:06:55 +02:00
Laurent Destailleur
892ec3a661
Update card.php 2021-08-03 17:06:07 +02:00
Laurent Destailleur
1c981ccb9d Fix look and feel v14 2021-08-03 17:03:34 +02:00
Laurent Destailleur
1a0eeaf701 Fix phpcs 2021-08-03 16:35:47 +02:00
lmarcouiller
6e68bf10ef Update of card.php to change status 2021-08-03 16:06:08 +02:00
Laurent Destailleur
9ceab9b86b Doc 2021-08-03 15:47:00 +02:00
Laurent Destailleur
ce38ccc121
Merge pull request #18184 from ksar-ksar/patch-5
FIX #18181
2021-08-03 15:35:20 +02:00
Laurent Destailleur
070fc26dcb
Merge pull request #18309 from grandoc/new_branch_02_08_2021
New branch 02 08 2021
2021-08-03 15:31:25 +02:00
Florian HENRY
19f17ed114 fix: bad setEventMessages input 2021-08-03 15:30:36 +02:00
Laurent Destailleur
c40cc3a51e
Merge pull request #18194 from FHenry/fix_bad_eoordisplay
fix: bad setEventMessages input
2021-08-03 15:23:22 +02:00
Laurent Destailleur
29715c2f2e
Merge pull request #18318 from altairisfr/PROPAL_REOPEN_UNSIGNED_ONLY
NEW : add constant PROPAL_REOPEN_UNSIGNED_ONLY
2021-08-03 15:09:31 +02:00
Laurent Destailleur
f412af5885
Merge pull request #18320 from lainwir3d/restapi_shipment_close
CLOSE #18319 REST API - Shipment: Add 'close' action / endpoint
2021-08-03 15:07:53 +02:00
Laurent Destailleur
115b0e6831
Update api_shipments.class.php 2021-08-03 15:07:16 +02:00
lmarcouiller
c8fd7ccbb6 Close #18043 : fk_user_assign in create ticket 2021-08-03 15:06:53 +02:00
Laurent Destailleur
8b746b64a0 Prepare 14.0.1 2021-08-03 15:04:29 +02:00
Laurent Destailleur
ce5acda635 Fix phpcs 2021-08-03 15:03:41 +02:00
Laurent Destailleur
5543d68e5a Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-08-03 15:02:24 +02:00
Laurent Destailleur
d0c57dac34 FIx #18217 - Salary - link 'salary' of bank_url not managed 2021-08-03 15:02:09 +02:00
d1f9762ca9 CLOSE #18319 REST API - Shipment: Add 'close' action / endpoint / POST method.
Allow "closing" a shipment through the REST API.
2021-08-03 13:37:28 +04:00
Christophe Battarel
7a7287489d NEW : add constant PROPAL_REOPEN_UNSIGNED_ONLY 2021-08-03 11:24:21 +02:00
Laurent Destailleur
0c528db1eb
Merge pull request #18306 from dolibit-ut/patch-365
Update ChangeLog
2021-08-02 20:22:03 +02:00
Laurent Destailleur
cad39cc75d
Merge pull request #18307 from dolibit-ut/patch-366
Update llx_c_actioncomm.sql
2021-08-02 20:21:34 +02:00
Laurent Destailleur
000c32c137 FIx #18313 2021-08-02 20:20:52 +02:00
Laurent Destailleur
cf072c1061
Merge pull request #18314 from ATM-Consulting/FIX_deposit_mask_tulip
FIX: using Tulip, deposit mask doesn't get saved
2021-08-02 20:15:47 +02:00
Laurent Destailleur
0058e32207 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-02 19:03:38 +02:00
atm-florian
fc33d46c77 FIX: using Tulip, deposit mask doesn't get saved 2021-08-02 18:56:45 +02:00
Laurent Destailleur
eced1c824a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/core/class/html.form.class.php
	htdocs/projet/tasks/time.php
2021-08-02 18:47:09 +02:00
Laurent Destailleur
2deaac0fc4 Fix changelog 2021-08-02 18:34:38 +02:00
Laurent Destailleur
d822421e10 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/accountancy/tpl/export_journal.tpl.php
	htdocs/projet/tasks/time.php
2021-08-02 18:31:26 +02:00
Laurent Destailleur
61e3a57de7 Fix label 2021-08-02 18:23:05 +02:00
Laurent Destailleur
efda27000e Fix set of date of rum signature 2021-08-02 18:13:35 +02:00
Laurent Destailleur
8077fae42e Code comment 2021-08-02 17:56:58 +02:00
Laurent Destailleur
04fc2c0ce7 css 2021-08-02 17:49:27 +02:00
Philippe GRAND
3c05cd0757 fix typo and translation 2021-08-02 12:41:55 +02:00
Philippe GRAND
703217acd0 backward 2021-08-02 12:39:45 +02:00
Philippe GRAND
3acb304dd3 fix typo and translation 2021-08-02 12:35:46 +02:00
UT from dolibit
b801188801
Update llx_c_actioncomm.sql 2021-08-02 12:12:57 +02:00
UT from dolibit
893bae0bd7
Update ChangeLog 2021-08-02 11:45:14 +02:00
Frédéric FRANCE
099164c043
Merge remote-tracking branch 'upstream/develop' into migration_cat_tickets 2021-08-02 09:01:27 +02:00
Laurent Destailleur
c6233e4a39
Merge pull request #18165 from trekmorris/patch-3
Update opensurvey.lang manually
2021-08-02 00:03:38 +02:00
Laurent Destailleur
a4843f7d10
Merge pull request #18176 from ATM-Consulting/FIX_13.0_dispatch_cloned_datepicker_not_working
FIX: datepickers cloned using jquery are not working
2021-08-01 23:51:57 +02:00
Laurent Destailleur
7ab129d489
Merge pull request #18179 from joseplluis/patch-8
Add missing line product variables
2021-08-01 23:47:56 +02:00
Laurent Destailleur
b725dd0309
Merge pull request #18186 from frederic34/patch-8
fix variable
2021-08-01 23:46:42 +02:00
Laurent Destailleur
d8a9a0cfb8
Merge pull request #18188 from frederic34/patch-11
fix php8 warnings
2021-08-01 23:42:17 +02:00
Laurent Destailleur
3ca1e1c4c0
Merge pull request #18196 from FHenry/develop_addexport
new: add column into export invoice
2021-08-01 23:32:51 +02:00
Laurent Destailleur
957b373ecd
Merge pull request #18200 from frederic34/notify
notify class indent
2021-08-01 23:27:49 +02:00
Laurent Destailleur
e8d385ae42
Merge pull request #18224 from aspangaro/14p9
FIX: Missing column Date validation in ledger & subledger
2021-08-01 23:26:25 +02:00