Laurent Destailleur
|
f6f4968af6
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/societe/consumption.php
|
2021-05-06 16:52:36 +02:00 |
|
Laurent Destailleur
|
0daab6a55a
|
Code comment
|
2021-05-06 16:50:22 +02:00 |
|
Laurent Destailleur
|
a26d00428e
|
Merge pull request #17444 from Hystepik/develop_v13#1
Fix #17361 : change of llx_export_model type to varchar(64)
|
2021-05-06 16:48:46 +02:00 |
|
Dorian Vabre
|
2e7d5e6d46
|
Merge branch 'dev_EventOrganizer_payment' of github.com:DorianVabre/dolibarr into dev_EventOrganizer_suggest
|
2021-05-06 16:48:30 +02:00 |
|
Laurent Destailleur
|
b7601cb662
|
Merge pull request #17496 from daraelmin/daraelmin-patch-4
Fix amnt can be paid for member as membersubscription
|
2021-05-06 16:47:41 +02:00 |
|
Laurent Destailleur
|
824a601014
|
Merge pull request #17507 from atm-john/11.0_fix_search_accent_in_description
FIX : search accented words in product description (consumption page)
|
2021-05-06 16:45:21 +02:00 |
|
Laurent Destailleur
|
98a4f603f2
|
Complete merge of thirdparty into API
|
2021-05-06 16:41:06 +02:00 |
|
Laurent Destailleur
|
0dbd68564c
|
Merge pull request #17493 from FHenry/13_fix_bank_url_merge_account
FIX: merge thirparty also work for bank URL entry
|
2021-05-06 16:39:13 +02:00 |
|
Laurent Destailleur
|
7386a223e8
|
Update account.class.php
|
2021-05-06 16:38:34 +02:00 |
|
Laurent Destailleur
|
7515de456f
|
Merge pull request #17495 from daraelmin/daraelmin-patch-2
New 5 substitutions keys "online payment link" in mailing
|
2021-05-06 16:36:10 +02:00 |
|
Dorian Vabre
|
295c63468b
|
wip vote page
|
2021-05-06 16:32:39 +02:00 |
|
Laurent Destailleur
|
7a76dc4648
|
Merge pull request #17382 from DorianVabre/dev_EventOrganizer_payment
new: working on conference or booth object and event type #FoundationFunding
|
2021-05-06 16:31:30 +02:00 |
|
Laurent Destailleur
|
0867be4af5
|
Merge pull request #17513 from dolibit-ut/patch-320
Update modules_member.class.php
|
2021-05-06 16:27:45 +02:00 |
|
Laurent Destailleur
|
475ed369ed
|
Merge pull request #17490 from marc-dll/FIX_develop_expense_report_db_field
FIX: expense report: column last_main_doc forgotten in v14 migration script
|
2021-05-06 16:27:01 +02:00 |
|
lmarcouiller
|
7d649dd90e
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1
|
2021-05-06 16:26:30 +02:00 |
|
Laurent Destailleur
|
864c2a0bf7
|
Merge pull request #17506 from atm-gauthier/FIX_column_adding_management_in_dom_added_with_ajax_case
FIX : if dom is added with ajax, selector needs to keep working
|
2021-05-06 16:24:26 +02:00 |
|
Laurent Destailleur
|
9ce23ac6b2
|
Merge pull request #17494 from atm-john/fix_not_enabled_email_template
FIX saving template email
|
2021-05-06 16:22:19 +02:00 |
|
Laurent Destailleur
|
5a927702c0
|
Merge pull request #17500 from fmarcet/develop
NEW: Add import on BOM
|
2021-05-06 16:21:09 +02:00 |
|
Laurent Destailleur
|
9e057332f0
|
Merge pull request #17486 from NextGestion/dolibarr_partnership
Dolibarr partnership
|
2021-05-06 16:11:13 +02:00 |
|
Laurent Destailleur
|
4c20aa6a60
|
Merge pull request #17485 from kastoras/add_pagination_to_get_products
Close #17484 Add pagination to get products
|
2021-05-06 16:05:06 +02:00 |
|
UT from dolibit
|
9cd78e6ecf
|
Update modules_member.class.php
|
2021-05-06 16:00:49 +02:00 |
|
Laurent Destailleur
|
a0f85044fc
|
Merge pull request #17510 from Hystepik/develo#2
Fix #17501 : Undownloable attached file
|
2021-05-06 16:00:20 +02:00 |
|
Laurent Destailleur
|
a4d93424dc
|
Merge pull request #17498 from marc-dll/FIX_11.0_pgsql_where_boolean
FIX: pgsql: prevent 'WHERE 1'
|
2021-05-06 15:58:41 +02:00 |
|
Laurent Destailleur
|
21ce99338b
|
Merge pull request #17504 from FHenry/13.0
fix missing token
|
2021-05-06 15:57:45 +02:00 |
|
Laurent Destailleur
|
04ac12b477
|
Merge pull request #17508 from dolibit-ut/patch-319
Update llx_00_c_country.sql
|
2021-05-06 15:57:17 +02:00 |
|
Laurent Destailleur
|
7bd6cdbf59
|
Merge pull request #17505 from FHenry/13_fix_webdavlink
fix: allow webdavs link type
|
2021-05-06 15:56:55 +02:00 |
|
Anthony Berton
|
2615a1f152
|
Update list.php
|
2021-05-06 15:34:45 +02:00 |
|
Noé Cendrier
|
5e57a7173d
|
Merge branch 'develop' into productcard_traceability_fields
|
2021-05-06 15:21:48 +02:00 |
|
altairis-noe
|
c1b5d26ca0
|
reconcile before PR - second take
|
2021-05-06 15:20:49 +02:00 |
|
altairis-noe
|
b979fad859
|
reconcile before PR
|
2021-05-06 15:19:29 +02:00 |
|
altairis-noe
|
3311a0b00e
|
Merge branch 'productcard_traceability_fields' of github.com:altairisfr/dolibarr into productcard_traceability_fields
|
2021-05-06 14:56:04 +02:00 |
|
Dorian Vabre
|
2f7dd4e807
|
wip vote page
|
2021-05-06 14:53:23 +02:00 |
|
altairis-noe
|
2bdea3732d
|
days in lifetime trans
|
2021-05-06 14:52:48 +02:00 |
|
Noé Cendrier
|
57985e866a
|
Merge pull request #10 from altairis-noe/productcard_traceability_fields
Productcard traceability fields
|
2021-05-06 14:36:15 +02:00 |
|
Dorian Vabre
|
a00c9c44c3
|
now adding contact to conforbooth, not only to thirdparty
|
2021-05-06 14:26:41 +02:00 |
|
Dorian Vabre
|
9c20e92e17
|
country no longer required for conf, preparation of add_contact to conforbooth (not done, commented) and page name change
|
2021-05-06 14:06:53 +02:00 |
|
Dorian Vabre
|
abeb1c644c
|
country now only required when paying a booth, dates of start and end required
|
2021-05-06 13:50:13 +02:00 |
|
Dorian Vabre
|
4d8d94bfbf
|
fixes: show only correspond button on specific page, id no longer encoded in hidden parameter
|
2021-05-06 12:13:49 +02:00 |
|
Dorian Vabre
|
c56c7afa89
|
update on specifications on suggesting a booth/conf since its now two separated pages
|
2021-05-06 11:59:24 +02:00 |
|
Dorian Vabre
|
df78aaff88
|
now 2 distinct pages to suggest a conf or a booth
|
2021-05-06 11:49:00 +02:00 |
|
Dorian Vabre
|
099ad77d44
|
encryption change for url
|
2021-05-06 11:32:07 +02:00 |
|
Dorian Vabre
|
10c9e9b77c
|
wip
|
2021-05-06 11:31:23 +02:00 |
|
Dorian Vabre
|
a68a7c1f67
|
wip
|
2021-05-06 11:27:48 +02:00 |
|
Dorian Vabre
|
4c50d210dd
|
creation of the 3 main pages
|
2021-05-06 11:26:42 +02:00 |
|
Laurent Destailleur
|
6f4e151b91
|
Fix permissions
|
2021-05-06 11:25:46 +02:00 |
|
Laurent Destailleur
|
644079ff00
|
Fix sql
|
2021-05-06 11:18:35 +02:00 |
|
altairis-noe
|
7c53e2bb18
|
too much td
|
2021-05-06 11:16:22 +02:00 |
|
altairis-noe
|
cce132b8da
|
one more space
|
2021-05-06 10:04:54 +02:00 |
|
altairis-noe
|
435cbcd16c
|
spaces after !
|
2021-05-06 10:01:53 +02:00 |
|
altairis-noe
|
8a108ae5e8
|
qcstatus out of formproduct and corrections in syntax
|
2021-05-06 09:59:33 +02:00 |
|