lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
109,623 Commits 43 Branches 150 Tags 886 MiB
develop
Commit Graph

11882 Commits

Author SHA1 Message Date
Laurent Destailleur
9aaf11f8cd Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-06 01:52:34 +02:00
Laurent Destailleur
319a531571 Trans 2021-09-06 01:51:25 +02:00
Laurent Destailleur
b58684af98 Fix trans 2021-09-05 14:31:33 +02:00
Laurent Destailleur
138af805b3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-04 14:11:38 +02:00
Laurent Destailleur
87b33c09e0
Merge pull request #18595 from FHenry/14_eventorg 
NEW : Can register an attendees on project global (and also on conférence)
 2021-09-03 20:50:21 +02:00
Florian HENRY
96f9f8ae98 work on event 2021-09-03 15:40:33 +02:00
Laurent Destailleur
3598816763 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-02 21:05:00 +02:00
Laurent Destailleur
8ea1a9602b NEW Add import / export of MO and BOMLines - Close #18499 2021-09-02 21:00:31 +02:00
henrynopo
6e5258f482 Update stocks.lang 2021-09-02 19:26:32 +02:00
Laurent Destailleur
0c72734c4a
Merge pull request #18536 from henrynopo/patch-14 
Fix error of ValidateSending
 2021-09-02 19:23:59 +02:00
Laurent Destailleur
cd313d7506 Save type (manufacture/disassemble) on MO. 2021-09-02 15:23:31 +02:00
Laurent Destailleur
8600d8d00d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-01 22:50:06 +02:00
Laurent Destailleur
076bfd82a3 FIX option "Default value for field 'Refuse bulk emailings'" 2021-09-01 22:38:47 +02:00
Laurent Destailleur
c762840dec FIX option "Default value for field 'Refuse bulk emailings'" 2021-09-01 22:37:15 +02:00
Laurent Destailleur
c207dde5e1 Fix cancel button 2021-09-01 20:10:56 +02:00
Laurent Destailleur
eaf1379751 Trans 2021-09-01 18:55:27 +02:00
Laurent Destailleur
831a66465f Fix trans 2021-09-01 18:28:21 +02:00
Laurent Destailleur
79a25248cd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
 2021-09-01 17:55:32 +02:00
Laurent Destailleur
38c0e93285 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/core/class/commonobjectline.class.php
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/public/project/index.php
 2021-09-01 17:52:04 +02:00
Laurent Destailleur
8dd4dae8f8
Merge pull request #18558 from FHenry/dev_more_inv_task_comment 
From #18530 display date and duration in invoice generation from task time spent
 2021-09-01 16:27:24 +02:00
Alexandre SPANGARO
dbe6861f79 Merge remote-tracking branch 'upstream/develop' into 15a8 2021-09-01 14:09:02 +02:00
Laurent Destailleur
fb0bd41178 Fix trans 2021-09-01 13:02:36 +02:00
Laurent Destailleur
bcd835ddbd Fix tooltips 2021-09-01 12:34:59 +02:00
Laurent Destailleur
a48473ba7a Missing trans exclude 2021-09-01 12:22:44 +02:00
Laurent Destailleur
dad4c34ec5 Debug module conference or booth 2021-08-31 23:51:45 +02:00
lvessiller
6c2cf4377a NEW can enable/disable external calendar by default 2021-08-31 18:14:16 +02:00
Laurent Destailleur
0aa4868c34 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-31 13:14:01 +02:00
Laurent Destailleur
cceba665a2 NEW Option "Add a link on the PDF to make the online payment" 2021-08-31 12:29:14 +02:00
Florian HENRY
009fa41762 add checkbox to ask detail on line desc 2021-08-31 09:10:57 +02:00
Laurent Destailleur
18e7a5efa9 Trans 2021-08-30 19:00:15 +02:00
Adrien Raze
709a297563 NEW : Allow drag and drop on kits 2021-08-30 14:45:42 +02:00
henrynopo
71f6b472e3
Update stocks.lang 2021-08-29 07:51:29 +08:00
Laurent Destailleur
301d7134b3
Merge branch 'develop' into patch-2 2021-08-28 17:37:54 +02:00
Laurent Destailleur
f825d3fda4 Trans 2021-08-28 13:27:55 +02:00
Laurent Destailleur
c02fb6b9a8 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-28 03:15:47 +02:00
Anthony Berton
afccd0b565 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into add_option_pdf_global_with_picture 2021-08-26 17:09:08 +02:00
Laurent Destailleur
931f712c5f Fix import gender man/woman, not 0/1 + import of thirdparty for members 2021-08-26 11:55:22 +02:00
Laurent Destailleur
ac2fc9c57f Fix import gender man/woman, not 0/1 + import of thirdparty for members 2021-08-26 11:53:57 +02:00
Alexandre SPANGARO
006481cdff Update dashboard tab 2021-08-26 06:01:51 +02:00
henrynopo
a25580f97c
Update bills.lang 2021-08-26 10:38:53 +08:00
henrynopo
daa34032ff
Update bills.lang 2021-08-26 09:43:02 +08:00
Laurent Destailleur
65629711d0 FIX #18484 2021-08-25 14:53:14 +02:00
Laurent Destailleur
6c71c6f5e5 Fix trans 2021-08-25 14:18:52 +02:00
Laurent Destailleur
169282c82b
Merge pull request #18458 from andreubisquerra/develop 
NEW Split Sale in TakePOS
 2021-08-24 14:51:08 +02:00
Laurent Destailleur
1cfe165613 Better name for field 2021-08-24 13:34:10 +02:00
Laurent Destailleur
56c314c671 Fix translation 2021-08-24 00:32:20 +02:00
Adrien Raze
6cd92ca829 NEW : Trad + Comments + Adding tooltips for conf 2021-08-23 12:15:09 +02:00
Alexandre SPANGARO
a1d3e21e77 NEW IHM - Include new options to manage dashboard 2021-08-22 05:25:13 +02:00
Laurent Destailleur
58fa0740c3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
	htdocs/langs/en_US/errors.lang
 2021-08-22 01:41:18 +02:00
Laurent Destailleur
4cd5a53b63 FIX Recommended session.cookie_samesite must be 'Lax' not 'Strict'. 2021-08-22 00:44:51 +02:00
andreubisquerra
a6bdff59c9
Update lang 2021-08-21 22:31:54 +02:00
Florian HENRY
1cc04c54ca Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_project_upgrade_external_user_perms_project 2021-08-21 15:29:32 +02:00
jpb
ed65bca666 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_field_in_service_object 2021-08-20 14:06:13 +02:00
Laurent Destailleur
335e1ff405 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-20 12:45:37 +02:00
Adrien Raze
f4d4733b15 NEW : Select for BOM workable + JS to fill it according to the product selected 2021-08-19 15:37:32 +02:00
Anthony Berton
1e0373ed50 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into add_option_pdf_global_width_picture 2021-08-19 15:22:23 +02:00
Klaas Oldenburger
0d4badb50b
Update main.lang 
Change date format to Dutch standards
 2021-08-19 08:26:37 +02:00
Gauthier PC portable 024
c56c74bbdd Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2021-08-18 18:31:11 +02:00
jpb
fcd485f614 merge conflict 2021-08-18 09:16:28 +02:00
Laurent Destailleur
c001fb9555 Clean code 2021-08-17 23:23:15 +02:00
Laurent Destailleur
bbcea38793 Fix phpcs 2021-08-17 21:58:06 +02:00
Laurent Destailleur
59c9c48844
Merge branch 'develop' into new_validation_method_for_common_object 2021-08-17 19:35:36 +02:00
Laurent Destailleur
5d70ce4f99
Merge pull request #18310 from Hystepik/develop#2 
Close #18302 : Mass action leave requests aproval
 2021-08-17 19:23:30 +02:00
Laurent Destailleur
95721d36ab
Merge pull request #17687 from FHenry/dev_massaction_paid_custom_invoice 
NEW : mass action paid customer invoice
 2021-08-17 19:10:49 +02:00
Laurent Destailleur
e8646c7919
Merge branch 'develop' into PDF_Propal_frame_option 2021-08-17 18:30:37 +02:00
Laurent Destailleur
8eba57f722
Merge branch 'develop' into PDF_Option_show_code_client 2021-08-17 16:51:01 +02:00
Laurent Destailleur
27a580dc95
Merge branch 'develop' into PDF_show_sender_name 2021-08-17 16:41:19 +02:00
Laurent Destailleur
6e7c8677eb
Update admin.lang 2021-08-17 16:40:31 +02:00
Laurent Destailleur
f18f970b08 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-17 13:52:36 +02:00
Laurent Destailleur
558c716931 Trans 2021-08-17 05:10:30 +02:00
Laurent Destailleur
f51bcf0038 Debug notification module 2021-08-17 03:20:57 +02:00
Laurent Destailleur
4b89a45ade Trans 2021-08-17 02:16:25 +02:00
Laurent Destailleur
ecb673f15c Debug default BOM on product 2021-08-16 23:02:55 +02:00
Anthony Berton
7d143c5575 Merge branch 'add_option_pdf_global_with_picture' of https://github.com/bb2a/dolibarr into add_option_pdf_global_width_picture 2021-08-12 10:33:55 +02:00
Anthony Berton
fdd85845ce erreur save const 2021-08-12 10:27:19 +02:00
jpb
b1cba14718 merge conflict 2021-08-12 09:36:34 +02:00
Laurent Destailleur
bfedd4a04c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-11 20:47:51 +02:00
Laurent Destailleur
23713d1deb
Merge pull request #18328 from lainwir3d/shipment_close_order_on_close 
NEW #18326 Workflow: Close order on shipment closing.
 2021-08-11 20:47:06 +02:00
Laurent Destailleur
8e9d0a567a
Merge pull request #18360 from andreubisquerra/develop 
NEW Customer Display with TakePOS
 2021-08-11 20:00:36 +02:00
Laurent Destailleur
34b53592b8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2021-08-11 19:44:33 +02:00
Laurent Destailleur
310b5c974b Fix help 2021-08-11 19:43:12 +02:00
Anthony Berton
32e5b531ba
Merge branch 'develop' into PDF_show_sender_name 2021-08-11 18:38:30 +02:00
Anthony Berton
956bd00c13 CHANGE_CONST_ADD_DOC 2021-08-11 18:37:13 +02:00
Anthony Berton
652cd3afa5
Merge branch 'develop' into PDF_Option_show_code_client 2021-08-11 18:17:58 +02:00
Anthony Berton
0bab31e973
Merge branch 'develop' into PDF_Propal_frame_option 2021-08-11 18:12:02 +02:00
Anthony Berton
c5e8302ba2 Const 2021-08-11 16:18:16 +02:00
Laurent Destailleur
065d7a781e
Merge branch 'develop' into PDF_Add_propal_option_paiment 2021-08-11 15:24:10 +02:00
Anthony Berton
b45a57060f const_and_other_doc 2021-08-11 12:36:16 +02:00
Laurent Destailleur
21df418468 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-10 19:28:44 +02:00
Anthony Berton
be016197b4 Trans 2021-08-10 18:07:11 +02:00
Anthony Berton
bcb58ae6ef trans 2021-08-10 18:06:35 +02:00
Anthony Berton
2cb7e828a3 Trans 2021-08-10 18:05:58 +02:00
Anthony Berton
69e31e1655 ok 2021-08-10 18:04:59 +02:00
Anthony Berton
6a41edd3c2 ok 2021-08-10 13:02:37 +02:00
Laurent Destailleur
3b73abed7c css 2021-08-10 11:40:25 +02:00
Anthony Berton
f8df845442 Const and Com 2021-08-10 09:45:15 +02:00
Anthony Berton
3b04c28c4f const 2021-08-10 09:41:40 +02:00
Anthony Berton
284b40f152 CONST 2021-08-10 09:38:07 +02:00
Anthony Berton
0bead55836 ok 2021-08-09 18:11:36 +02:00
Laurent Destailleur
b5b53e382e Fix missing template 2021-08-09 18:01:41 +02:00
Anthony Berton
41457d2adb ok 2021-08-09 17:16:48 +02:00
Laurent Destailleur
591b4c6793 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-09 16:49:16 +02:00
Laurent Destailleur
2de728c074 Fix trans 2021-08-09 16:12:20 +02:00
andreubisquerra
091f5ab23b
Customer Display Lang 2021-08-08 19:12:45 +02:00
Laurent Destailleur
c603dfb5ea Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-05 15:16:04 +02:00
Laurent Destailleur
047bbbb298 NEW Can set/unset the usual working day of the week 2021-08-05 14:42:28 +02:00
Laurent Destailleur
5d717113be Add language key 2021-08-05 11:20:43 +02:00
Laurent Destailleur
965bdbb342 Trans 2021-08-04 23:08:57 +02:00
jpb
f99ba2c1e1 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_field_in_service_object 2021-08-04 17:26:23 +02:00
Laurent Destailleur
6a31d4657b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-04 13:12:46 +02:00
Laurent Destailleur
bec87f5739 Fix translation ICS 2021-08-04 13:12:07 +02:00
Gauthier PC portable 024
f77b6d87c9 FIX : langs 2021-08-04 09:18:32 +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
lainwir3d
4873a91afc CLOSE #18326 Workflow: Close order on shipment closing. 
Allow an order to be closed automatically when all linked shipment have been closed and all products / items have been shipped.
 2021-08-03 17:55:28 +04:00
Laurent Destailleur
d0c57dac34 FIx #18217 - Salary - link 'salary' of bank_url not managed 2021-08-03 15:02:09 +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
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
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
Gauthier PC portable 024
b83b77beb5 NEW : stock transfer sheet proforma + default model system like cmd invoice, etc... 2021-08-02 17:28:41 +02:00
lmarcouiller
1cef6d31e8 Close #18302 : Mass action leave requests 2021-08-02 15:45:55 +02:00
Gauthier PC portable 024
a45bab10bd Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2021-08-02 10:09:18 +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
7eb8232b75 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-07-31 17:21:05 +02:00
Laurent Destailleur
bd35d86268 Debug v14 2021-07-31 17:20:48 +02:00
Laurent Destailleur
cb2c7d1485 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-31 17:00:00 +02:00
Laurent Destailleur
6f449cfd6c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-31 16:33:38 +02:00
Laurent Destailleur
9f293066ab
Merge pull request #18206 from Hystepik/develop#2 
New : Inventory scanner tool implemented
 2021-07-31 13:27:18 +02:00
jpb
15578c2ec2 merge conflict 2021-07-30 10:57:04 +02:00
Florian HENRY
510cf36bbd Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14_deveventorg 2021-07-30 09:26:55 +02:00
Laurent Destailleur
9954a0e4bb Fix status of tickets 2021-07-30 00:40:06 +02:00
Laurent Destailleur
f02dee2e21 Fix test on missing install.lock 2021-07-29 23:47:59 +02:00
Florian HENRY
6f3080c67c send mail from ConfOrBooth list to attendees or santd company 2021-07-29 19:24:12 +02:00
Florian HENRY
ae5bb956ac fix invoice in stand registration pb 2021-07-29 17:18:05 +02:00
Gauthier PC portable 024
6d460d78ca NEW : Stocks transfers objects management 2021-07-29 16:09:07 +02:00
Alexandre SPANGARO
712f0b897d FIX: Accountancy - Debug Export Sage50 / CIEL Compta / CIEL Compta Evo (Format XIMPORT) 2021-07-28 12:02:45 +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
jpb
dc90a62d90 add tooltips helper on product card 2021-07-20 15:18:14 +02:00
jpb
1237c5ba55 add msg to formconfirm on propal invoice and commande 2021-07-20 14:46:56 +02:00
lmarcouiller
dd9eb28230 Barcode scanner tool update 2021-07-20 14:43:36 +02:00
jpb
367e839239 change class css and behavior js 2021-07-20 13:56:30 +02:00
jpb
e11afb7da0 add color on date dield and warning on line 2021-07-20 11:23:35 +02:00
jpb
97287af987 add field to object product, add sql 2021-07-19 14:03:03 +02:00
lmarcouiller
b309af0ab8 First push new scan quanty inventory 2021-07-19 13:43:48 +02:00
trekmorris
284627b693
Update opensurvey.lang manually 
This file is not auto sync from transifex . So update it manually .
 2021-07-16 23:55:29 +08: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
0ccc2d9033 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-16 15:01:11 +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
Florian HENRY
63a47112ae new: #18162 2021-07-16 11:14:30 +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
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
b552c6b4fe Fix status color 2021-07-14 14:32:05 +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
lmarcouiller
35b29481c7 Close #18131 : new massaction for thirdparty 2021-07-13 10:05:38 +02:00
Laurent Destailleur
202ee8340a FIX #18091 2021-07-12 23:01:34 +02:00
Laurent Destailleur
7533c9e3a5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/fr_FR/interventions.lang
 2021-07-12 12:01:53 +02:00
Laurent Destailleur
e989284f14 Fix setup help 2021-07-12 10:50:37 +02:00
evarisk-theo
3bc2dec696
Merge branch 'Dolibarr:develop' into add-ticket-categories-views 2021-07-12 09:10:25 +02:00
Laurent Destailleur
4b2bbd0364 Sync transifex 2021-07-11 20:27:03 +02:00
ATM john
dc3f960ce8 Add validate to module builder 2021-07-11 14:05:26 +02:00
Laurent Destailleur
97ac547fe2 Fix/debug the numbering module to autocalculate a new lot. 2021-07-11 00:44:36 +02:00
Laurent Destailleur
e51e31dc11
Merge pull request #18087 from atm-john/new_modal_btn_option 
New :  Add js confirm modal option to BTN created with dolGetButtonAction
 2021-07-09 10:09:08 +02:00
Laurent Destailleur
e83df92359 Trans 2021-07-08 17:25:14 +02:00
Laurent Destailleur
08adb73c6e Trans 2021-07-08 17:24:05 +02:00
Laurent Destailleur
9d3f7c5cdd Support fk_parent into dictionary of ticket categories 2021-07-07 18:30:10 +02:00
Laurent Destailleur
ced4ea1314 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/core/tpl/objectline_view.tpl.php
 2021-07-06 15:59:59 +02:00
Laurent Destailleur
ed71888501
Merge pull request #18093 from FHenry/14_deveventorg 
new: working on conference or booth object and event type #FoundationFunding
 2021-07-06 15:05:09 +02:00
Laurent Destailleur
b4b939e1a9 Fix add migration of export/import profile when field name changes 2021-07-06 11:54:32 +02:00
Laurent Destailleur
7dab4ef571 Debug v14 2021-07-06 11:18:09 +02:00
Laurent Destailleur
c901e518a7 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-06 02:11:28 +02:00
Laurent Destailleur
6e24ee48d4 Debug security page 2021-07-06 02:07:58 +02:00
Laurent Destailleur
fe5c4f4a0e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-05 17:04:38 +02:00
Laurent Destailleur
22c45fe7cc Trans 2021-07-05 15:44:11 +02:00
Florian HENRY
dd3c0ac5ab Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14_deveventorg 2021-07-05 15:17:43 +02:00
Florian HENRY
cb2c10551b on goign 2021-07-05 15:17:21 +02:00
Laurent Destailleur
383c678200 Trans 2021-07-05 14:09:01 +02:00
ATM john
a709cc583f Add modal option to btn 2021-07-04 22:59:53 +02:00
Laurent Destailleur
5779a56ae0 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-04 21:23:53 +02:00
Laurent Destailleur
0cccfb1cee Fix phpcs v14 2021-07-04 19:23:04 +02:00
Laurent Destailleur
affe6d9631 Sync transifex 2021-07-03 19:00:58 +02:00
Laurent Destailleur
9b7c0a9246 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2021-07-03 18:32:31 +02:00
Laurent Destailleur
e35ecdf58d Fix trans 2021-07-03 17:58:37 +02:00
John BOTELLA
167ae5b0f2
Merge branch 'develop' into new_validation_method_for_common_object 2021-07-02 12:04:14 +02:00
Théo David
110b0fecf5 NEW #18046 Add ticket categories views 2021-07-02 10:05:45 +02:00
Laurent Destailleur
0dce34f527 Fix trans 2021-07-01 19:06:16 +02:00
Laurent Destailleur
664af6ad1f Fix trans 2021-07-01 18:22:33 +02:00
Laurent Destailleur
4cff865c6b Trans 2021-06-30 18:22:40 +02:00
Christophe Battarel
27e2c62cab Merge branch 'develop' into timespent2inter 2021-06-30 10:34:22 +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
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
Francis Appels
1b7b45d72a Merge remote-tracking branch 'Dolibarr/14.0' into 14_fix_php8_part2 2021-06-29 16:56:48 +02:00
Francis Appels
051bb3f3ef Fix some core php8 warnings. 
Fixing php 8 warnings seems also to solve some situations like a paiment condition removed from dictionary can not be selected.
 2021-06-29 16:37:07 +02:00
Laurent Destailleur
24fccc2b72 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-06-29 15:53:22 +02:00
Laurent Destailleur
9b328bd8be Trans 2021-06-29 15:31:42 +02:00
Christophe Battarel
ef8aaa7fd7 generate intervention from time spent 2021-06-29 15:26:04 +02:00
Francis Appels
4558efdea3 Fix travis, also fixed upstream transifex 2021-06-28 19:21:29 +02:00
lmarcouiller
477b1272e0 Fix CI bot error 2021-06-28 13:30:26 +02:00
Laurent Destailleur
813440bd16 Trans 2021-06-27 18:29:54 +02:00
Laurent Destailleur
6ef08852f3 Transifex sync 2021-06-26 22:51:23 +02:00
Laurent Destailleur
bbc6b9aa1b Look and feel v14 2021-06-26 16:10:56 +02:00
Laurent Destailleur
e62ed28701 Debug v14 2021-06-26 15:39:52 +02:00
Laurent Destailleur
bc816f253c Fix tooltip 2021-06-26 02:07:18 +02:00
Laurent Destailleur
2c4fd9e409 Debug ENTREPOT_EXTRA_STATUS 2021-06-24 11:51:10 +02:00
Laurent Destailleur
e23ce0bb97 Trans 2021-06-24 09:57:54 +02:00
Laurent Destailleur
cf28fcc8cd CSS 2021-06-23 02:22:49 +02:00
Laurent Destailleur
de7df8ad9f Fix lang 2021-06-22 19:11:58 +02:00
Laurent Destailleur
2f6a91f506 Look and feel v14 2021-06-22 15:25:49 +02:00
Laurent Destailleur
23c0edf854
Merge pull request #17784 from atm-john/new_expedition_warehouse_auto_picking 
NEW/FIX : Allow auto picking for child warehouse and taking into account of the quantities already affected in list
 2021-06-20 12:55:30 +02:00
Laurent Destailleur
597bdee0bc Trans 2021-06-20 01:39:07 +02:00
Laurent Destailleur
414b5e612f Better info on upload size limit 2021-06-19 22:11:16 +02:00
Laurent Destailleur
d1ffd4fcc8 Trans 2021-06-15 13:48:00 +02:00
Laurent Destailleur
347c6ae8a8 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/main.lang
	htdocs/projet/class/project.class.php
	htdocs/projet/list.php
 2021-06-14 20:13:27 +02:00
Laurent Destailleur
a79afeaf02 Add info to allow debug of email collector 2021-06-14 19:58:12 +02:00
Laurent Destailleur
e0abbb2525 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-13 16:24:21 +02:00
Laurent Destailleur
48b604e4d5
Merge pull request #17905 from aspangaro/14a26 
Accountancy - Maxi debug of new functionnality date validation
 2021-06-13 16:19:44 +02:00
Laurent Destailleur
c4cba43bad FIX Broken Access Control reported by Ahsan Aziz. 2021-06-13 16:15:05 +02:00
Laurent Destailleur
497e9edbb2 Trans 2021-06-13 15:17:47 +02:00
Alexandre SPANGARO
53d0909a7c Merge remote-tracking branch 'upstream/develop' into 14a26 2021-06-12 14:20:00 +02:00
Marc de Lima Lucio
30e0471451 NEW: leave requests: add field into type dictionary to block request if balance is negative 2021-06-10 23:04:56 +02:00
Marc de Lima Lucio
1e7df0ba9f NEW: holiday: handle monthly updates with cronjob 2021-06-10 21:53:06 +02:00
Laurent Destailleur
c40bc085b2 Fix v14 2021-06-10 00:55:10 +02:00
Laurent Destailleur
e915e3403c Trans 2021-06-09 13:36:37 +02:00
Laurent Destailleur
997674aebc Fix trans 2021-06-09 13:15:47 +02:00
Laurent Destailleur
a78d29bb71 Fix trans 2021-06-09 13:05:32 +02:00
Laurent Destailleur
14e3d04e25 Add more info on security page 2021-06-09 13:02:17 +02:00
Marc de Lima Lucio
4c6dfd8d5c Merge branch 'NEW_13.0_project_block_timesheet' of github.com:marc-dll/dolibarr into develop 2021-06-09 11:03:04 +02:00
Marc de Lima Lucio
6733d278d8 NEW: project time spent: conf to prevent recording time after X months 2021-06-08 18:13:18 +02:00
Laurent Destailleur
cac63ddd3f Add missing translation 2021-06-07 12:16:11 +02:00
Laurent Destailleur
242f8b2544 Debug v14 2021-06-07 01:23:34 +02:00
ATM john
aa94d40ad0 WIP - create validation method for common object 2021-06-06 21:12:03 +02:00
Laurent Destailleur
9f177a0c63 Debug v14 2021-06-06 16:36:41 +02:00
Laurent Destailleur
a1bb7129da Debug v14 2021-06-06 15:29:49 +02:00
Laurent Destailleur
92b6425ce0 Debug v14 2021-06-05 18:20:07 +02:00
Laurent Destailleur
4695bbbd60 Trans 2021-06-05 12:59:19 +02:00
Laurent Destailleur
be97d66f5b Look and feel v14 2021-06-05 12:58:14 +02:00
Laurent Destailleur
f55be9fd3a
Merge pull request #17689 from DorianVabre/dev_EventOrganizer_suggest 
new: working on conference or booth object and event type #FoundationFunding
 2021-06-04 13:12:32 +02:00
Laurent Destailleur
3dd53f58f9
Merge pull request #17759 from Hystepik/develop#1 
Fix inventory/inventory.php
 2021-06-04 12:28:55 +02:00
Laurent Destailleur
bd72edc534
Merge pull request #17760 from Hystepik/develop#2 
Fix error name of menu knowledge management system
 2021-06-04 11:50:46 +02:00
Laurent Destailleur
2586fcd1a3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commandestats.class.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/holiday/month_report.php
	htdocs/product/class/product.class.php
	htdocs/product/stock/class/mouvementstock.class.php
	htdocs/societe/list.php
 2021-06-04 11:20:38 +02:00
ATM john
a7300d01b0 WIP - create validation method for common object 2021-06-03 09:49:07 +02:00
ATM john
a5c2ce1727 NEW/FIX : Allow auto picking for child warehouse and taking into account of the quantities already affected in list 2021-06-01 08:45:45 +02:00
Laurent Destailleur
0071d63fbb Fix for ro-md language 2021-05-31 13:35:03 +02:00
lmarcouiller
e3a5abe20e Fix error name of menu knowledge management system 2021-05-28 10:02:48 +02:00
lmarcouiller
e87d175041 Fix inventory/inventory.php 2021-05-28 09:57:21 +02:00
Laurent Destailleur
7983ce941e Fix performance page 2021-05-27 01:52:52 +02:00
Laurent Destailleur
f9d6438bae Debug v14 2021-05-25 23:26:03 +02:00
Laurent Destailleur
f252748dbf
Merge pull request #17343 from atm-gauthier/develop_new_collapse_batch_detail 
NEW : collapse batch detail
 2021-05-25 23:04:50 +02:00
lvessiller
38bd595ebd NEW translate supplier order menus and button 2021-05-21 14:18:46 +02:00
Dorian Vabre
720a368b29 link ics ok (todo: add name of speaker) 2021-05-20 17:24:27 +02:00
Dorian Vabre
307ab92bc0 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganizer_suggest 2021-05-20 16:13:42 +02:00
Florian HENRY
4d7b09ff2a done 2021-05-20 14:00:43 +02:00
Florian HENRY
62bc6e9e1f on going 2021-05-20 13:15:32 +02:00
Laurent Destailleur
026cc1b35a Debug for smartphone 2021-05-19 13:21:09 +02:00
Laurent Destailleur
58ffee193f Debug v14 2021-05-19 13:07:25 +02:00
Laurent Destailleur
7569275d28 Fix generation of invoice 2021-05-18 13:36:07 +02:00
Laurent Destailleur
cc1f98329d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
	htdocs/product/stock/replenish.php
	htdocs/ticket/card.php
	htdocs/user/class/api_users.class.php
 2021-05-17 19:50:10 +02:00
Laurent Destailleur
0121150e02
Merge pull request #17631 from fappels/14_reception 
Fix: Add test to delete supplier order if reception exist
 2021-05-17 13:22:34 +02:00
Francis Appels
c3bea1b46e Fix: Add test to delete supplier order if reception exist 2021-05-17 12:00:56 +02:00
Laurent Destailleur
082ae2e627 Fix trans 2021-05-17 11:11:17 +02:00
Laurent Destailleur
2f9a504dce Fix label 2021-05-17 09:30:09 +02:00
Laurent Destailleur
9eda9c1e21 Enhance setup 2021-05-12 19:55:16 +02:00
Laurent Destailleur
f504cbcec4 Fix log 2021-05-12 19:18:51 +02:00
Laurent Destailleur
75bd440591 Trans 2021-05-12 18:29:02 +02:00
Laurent Destailleur
e2ccacd4a9
Merge pull request #17512 from altairisfr/productcard_traceability_fields 
Stock product card traceability fields
 2021-05-11 21:40:50 +02:00
Laurent Destailleur
b090516a73
Merge pull request #17527 from daraelmin/daraelmin-setup-newmembermorphy 
Fix missing FORCEMORPHY in new member form setup
 2021-05-11 19:52:35 +02:00
Laurent Destailleur
c37ccc10b1 Debug v14 2021-05-11 14:50:04 +02:00
Gauthier PC portable 024
f9afe7e81a Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_collapse_batch_detail 2021-05-10 09:17:15 +02:00
Dorian Vabre
05bbb3dbf6 improved welcome msg on suggestbooth/conf pages 2021-05-07 16:39:03 +02:00
Dorian Vabre
c48234409b added copyright 2021-05-07 16:15:13 +02:00
Dorian Vabre
6111f43946 security fix, id was encoded where it should not be encoded 2021-05-07 14:49:00 +02:00
daraelmin
61786d328f
Update members.lang 2021-05-07 14:09:35 +02:00
daraelmin
c61383baf7
Update members.lang 2021-05-07 14:04:55 +02:00
Dorian Vabre
27cffbddf3 vote page ok 2021-05-07 12:21:15 +02:00
Laurent Destailleur
cc79fc6eee Lang 2021-05-07 11:30:27 +02:00
Laurent Destailleur
e791f9b863 Debug MRP feature 2021-05-06 21:34:59 +02:00
Laurent Destailleur
a7649a5bc2 Trans 2021-05-06 21:15:20 +02:00
Laurent Destailleur
b8b6919cb0 Fix label of dictionaries 2021-05-06 18:41:27 +02:00
Noé Cendrier
b608038370
Merge branch 'develop' into productcard_traceability_fields 2021-05-06 17:41:11 +02:00
Laurent Destailleur
6019df2dfc Merge branch 'batch_status_dict' of 
https://github.com/altairisfr/dolibarr into altairisfr-batch_status_dict

# Conflicts:
#	htdocs/langs/fr_FR/productbatch.lang
 2021-05-06 17:29:41 +02:00
Laurent Destailleur
a22d3f8627
Merge pull request #17301 from andreubisquerra/master 
NEW More permission in TakePOS (Can edit added line, can modify once order sent to kitchen)
 2021-05-06 17:20: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
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
9e057332f0
Merge pull request #17486 from NextGestion/dolibarr_partnership 
Dolibarr partnership
 2021-05-06 16:11:13 +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
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
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
altairis-noe
94e485aa06 qc_frequency in days and qcstatus elsewhere 2021-05-05 16:56:25 +02:00
lmarcouiller
020ad5aebe Add endofline in errors.lang 2021-05-05 16:49:51 +02:00
lmarcouiller
6589bab20a Merge branch 'develop' of github.com:Dolibarr/dolibarr into develo#2 2021-05-05 16:48:28 +02:00
lmarcouiller
ed59a8851f Fix #17501 : Undownloable attached file 2021-05-05 16:48:04 +02:00
Laurent Destailleur
7860464724 Sync transifex 2021-05-05 01:48:21 +02:00
Laurent Destailleur
526235d020 Fix substitution of mix html/nohtml 
Fix send email reminder for past due date of invoices
More PHPUnit test
 2021-05-04 13:33:18 +02:00
NextGestion
6f85cab6c4 Merge https://github.com/Dolibarr/dolibarr into dolibarr_partnership 2021-05-04 10:55:19 +01:00
Laurent Destailleur
b14de0bff7 NEW Can clone a cron job. 2021-05-04 10:56:21 +02:00
Laurent Destailleur
b2901bfae0 Make code simpler 2021-05-04 00:15:06 +02:00
Laurent Destailleur
16f1651d4e Add missing action events in trigger 2021-05-04 00:04:44 +02:00
Laurent Destailleur
a3431a790a
Merge pull request #17404 from bb2a/doctemplate 
New Add option for doctemplate
 2021-05-03 19:45:40 +02:00
Laurent Destailleur
a36df785b0 Fix lang 2021-05-03 19:20:49 +02:00
Laurent Destailleur
1847180c52
Merge pull request #17449 from mafzalzadeh/develop 
fixed Persian themes direction to rtl
 2021-05-03 15:20:16 +02:00
Laurent Destailleur
b22f2dd2c8
Merge pull request #17415 from Hystepik/develo#2 
Close #17271 : Replacement of 2 graphes in /compta/index.php
 2021-05-03 13:56:44 +02:00
Laurent Destailleur
d7e445efbd Better doc 2021-05-03 12:01:26 +02:00
Laurent Destailleur
0aef431c2a Move language keys 2021-05-02 18:56:40 +02:00
Laurent Destailleur
173ef31ad4 Enhance modulebuilder 2021-05-02 12:15:31 +02:00
Laurent Destailleur
ef734aeb58 Debug module inventory 2021-05-01 16:33:05 +02:00
Laurent Destailleur
575d335374 Debug generation of webp 2021-05-01 15:12:30 +02:00
mafzalzadeh
76f42c9b51
fixed Persian themes direction to rtl 2021-05-01 11:09:34 +04:30
Laurent Destailleur
6c649089b8 Fix trans 2021-04-30 17:24:07 +02:00
Laurent Destailleur
fdef17ef0c Fix translation 2021-04-30 16:59:58 +02:00
Laurent Destailleur
3ae303758b Fix trans 2021-04-30 16:49:52 +02:00
Laurent Destailleur
223a06b77d Clean code 2021-04-30 16:41:41 +02:00
Laurent Destailleur
69511e2706 Debug 2021-04-30 16:15:35 +02:00
Laurent Destailleur
46f41681ff Debug 2021-04-30 15:55:28 +02:00
Laurent Destailleur
67fd5477c9
Merge pull request #17427 from Hystepik/develop#4 
New Module Knowledge Management
 2021-04-30 12:12:15 +02:00
Laurent Destailleur
195163b81a Enhance security center 2021-04-30 11:45:45 +02:00
altairis-noe
f3ede35b4f lang correction 2021-04-29 13:18:14 +02:00
altairis-noe
38bba5dddc Merge branch 'develop' into batch_status_dict 2021-04-29 13:13:41 +02:00
altairis-noe
b04afc1753 merge conflict resolution 2021-04-29 13:08:24 +02:00
altairis-noe
762f41ea86 llx_c_productbatch_qcstatus as dictionnary name 2021-04-29 12:49:15 +02:00
Laurent Destailleur
655056ed31 Debug v14 2021-04-29 12:10:55 +02:00
Dorian Vabre
cb21131259
Merge branch 'develop' into dev_EventOrganizer_payment 2021-04-29 10:31:43 +02:00
Laurent Destailleur
de8e291c7e Debug v14 2021-04-29 10:01:10 +02:00
lmarcouiller
6da32015f4 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#4 2021-04-29 09:45:30 +02:00
Anthony Berton
bb5a11ff75 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into pr/bb2a/17185 2021-04-29 00:06:35 +02:00
Anthony Berton
c1e6109c4b Update 2021-04-29 00:03:16 +02:00
Anthony Berton
d3053c0c1b delete_fr_lang 2021-04-28 23:35:47 +02:00
Anthony Berton
5d17e26738 add_pdf_template_and_read_if_module_activate 2021-04-28 23:25:03 +02:00
Laurent Destailleur
64374f46da Debug v14 2021-04-28 23:01:20 +02:00
Laurent Destailleur
d4651c4721 Fix trad 2021-04-28 18:32:49 +02:00
Laurent Destailleur
2dc597f5d0 Make setup easier to understand 2021-04-28 18:04:00 +02:00
Laurent Destailleur
2738985689 Fix translation 2021-04-28 17:53:05 +02:00
Laurent Destailleur
6ff9a3c922 Fix trans 2021-04-28 17:13:43 +02:00
lmarcouiller
97043ca665 New module KnowledgeManagement 2021-04-28 14:57:49 +02:00
lmarcouiller
be22d43c60 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develo#2 2021-04-28 09:24:18 +02:00
Laurent Destailleur
3f7f166fb6 Make option label easier to understand. 2021-04-27 19:33:11 +02:00
altairis-noe
1a52ff6990 language strings 2021-04-27 17:38:32 +02:00
Dorian Vabre
54b5a43006 wip 2021-04-27 17:06:25 +02:00
lmarcouiller
a499f8f1f8 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develo#2 2021-04-27 16:26:06 +02:00
lmarcouiller
52bf0f0359 Close #17271 : Replament of 2 graph in compta/index.php 2021-04-27 16:02:46 +02:00
Dorian Vabre
8fc45da56e Merge branch 'dev_EventOrganizer_payment' of github.com:DorianVabre/dolibarr into dev_EventOrganizer_suggest 2021-04-27 15:01:59 +02:00
Dorian Vabre
fab12bc5e5 removed the indicated id of conf when on the subscription page for security (now showing label instead) 2021-04-27 14:04:08 +02:00
Dorian Vabre
a508cdbf59 every dol_encode for securekey replaced with dol_hash (dol_encode kept for encoding ids 2021-04-27 14:01:44 +02:00
Dorian Vabre
b24b297a40 adaptation of the payment for the booth location case 2021-04-27 12:30:49 +02:00
Dorian Vabre
151819b7ad added payment redirection to pay a booth, or status update for free booth/conference 2021-04-27 11:22:40 +02:00
Laurent Destailleur
0d391ec185 Show name of sitemap file 2021-04-27 11:20:04 +02:00
Gauthier PC portable 024
ed8b9fda13 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_collapse_batch_detail 2021-04-27 09:28:08 +02:00
Anthony Berton
6353084777 init 2021-04-27 00:22:39 +02:00
Laurent Destailleur
bc0f220ee3 Fix web site 2021-04-25 22:02:28 +02:00
Laurent Destailleur
2fd2c67139 Clean edit of user card 2021-04-25 15:21:31 +02:00
Dorian Vabre
e81637b608 wip on getting the existing attendee 2021-04-21 16:37:02 +02:00
Dorian Vabre
9809179aa4 securekey added to newpayment page, correction in the invoice line created 2021-04-21 14:19:07 +02:00
Dorian Vabre
4c57a6c207 wip on mail, sending ok but no content 2021-04-20 17:28:18 +02:00
altairis-noe
f1d68c201b conflict resolution 2021-04-20 16:56:15 +02:00
altairis-noe
d340e21cb3 No translation for dictionary labels 2021-04-20 16:13:36 +02:00
altairis-noe
07cd751c59 batch status dictionnary 2021-04-20 15:51:02 +02:00
Laurent Destailleur
455d5233e6 Fix trans 2021-04-20 11:58:51 +02:00
Laurent Destailleur
f1f63cd4e2 Enhance detection of update available 2021-04-20 11:56:26 +02:00
Gauthier PC portable 024
70f739b332 Merge branch '13.0_new_collapse_batch_detail' of github.com:atm-gauthier/dolibarr into develop_new_collapse_batch_detail 2021-04-20 10:03:20 +02:00
Gauthier PC portable 024
72ea2a56ea NEW : help text 2021-04-20 10:02:53 +02:00
Gauthier PC portable 024
cbfb2d9b47 Merge branch '13.0_new_collapse_batch_detail' of github.com:atm-gauthier/dolibarr into develop_new_collapse_batch_detail 2021-04-20 09:44:24 +02:00
Laurent Destailleur
39654260d6 Sync transifex 2021-04-20 00:45:48 +02:00
Laurent Destailleur
0ac380f23e
Merge pull request #17248 from altairisfr/batch_mask_product 
Batch mask product
 2021-04-19 22:16:22 +02:00
Laurent Destailleur
ee9c823c33
Merge pull request #17279 from aspangaro/14a38 
NEW: Add constant MAIN_BUGTRACK_URL to add possibility to redirect to other service
 2021-04-19 21:42:13 +02:00
Laurent Destailleur
e71e5d533d Fix HTML5 2021-04-19 21:30:25 +02:00
Laurent Destailleur
c966914f67
Merge branch 'develop' into new/check_update_for_module 2021-04-19 21:26:01 +02:00
Dorian Vabre
128dcb2e2b public registration page for booths and conferences created, wip 2021-04-19 17:26:01 +02:00
NextGestion
7cab4dd19d Manage partnership for members & code optimisation 2021-04-19 15:17:57 +01:00
Dorian Vabre
9a32526938 added space for the link to the conference/booth registration page 2021-04-19 15:49:51 +02:00
Laurent Destailleur
2cd9289de1 Fix error message 2021-04-19 15:09:13 +02:00
NextGestion
ea97cf5baf Change translate file 2021-04-19 13:46:21 +01:00
Gauthier PC portable 024
894eb1e5a4 NEW : "+" and "-" to show / hide batch details on product "stock" tab 2021-04-19 14:34:11 +02:00
NextGestion
263e110ca3 Enhance module Member 2021-04-19 13:19:32 +01:00
Laurent Destailleur
379f105e4c Trans 2021-04-19 14:18:41 +02:00
Dorian Vabre
701b53773b added description of the line in the invoice, problem with dates that are int 2021-04-19 09:54:29 +02:00
Alexandre SPANGARO
305b338a11 Update notified 2021-04-19 06:03:03 +02:00
Alexandre SPANGARO
7c0350e948 Merge remote-tracking branch 'upstream/develop' into 14a26 2021-04-19 06:02:26 +02:00
Laurent Destailleur
a1acc896e2 Accept several sizes for favicon 2021-04-18 23:25:47 +02:00
ATM john
7794927a64 New check update for modules 2021-04-18 20:12:24 +02:00
Alexandre SPANGARO
510f387a80 Merge remote-tracking branch 'upstream/develop' into 14a26 2021-04-18 07:49:48 +02:00
NextGestion
5a8742b3eb Cancel Partnership For Expired Members & Warning of partnership if Dolibarr backlink not found on partner website 2021-04-17 13:25:28 +01:00
NextGestion
87bcb212df
Merge branch 'develop' into dolibarr_partnership 2021-04-17 13:51:21 +01:00
Laurent Destailleur
0d8a354934 Set default length of password to 12 car. 
FIX #yogosha5855
 2021-04-17 03:11:58 +02:00
jove@bisquerra.com
712e1c4e7c NEW Edit sales lines rights in TakePOS 2021-04-17 01:06:30 +02:00
Laurent Destailleur
9eaf836c8e
Merge pull request #17281 from altairisfr/warehouses_in_project 
Warehouses in project
 2021-04-16 20:29:21 +02:00
NextGestion
f784114176 Add email template for accepted partnership 2021-04-16 13:53:12 +01:00
NextGestion
22ec79d03c Code optimisation 2021-04-16 12:10:26 +01:00
NextGestion
ba93ccaa01 Decline reason for partnership management 2021-04-16 10:56:01 +01:00
NextGestion
0d4a1d061a
Merge branch 'develop' into dolibarr_partnership 2021-04-16 11:01:08 +01:00
NextGestion
9304b3c474 Manage mass action "Send email" for Partnership module 2021-04-16 09:54:11 +01:00
Dorian Vabre
2cbe5b188e wip invoice 2021-04-15 16:57:41 +02:00
Laurent Destailleur
bf547cf20d Debug v14 2021-04-15 14:33:48 +02:00
NextGestion
e8fc6fe293 Code optimization 2021-04-15 11:21:33 +01:00
Dorian Vabre
dd7c09582f payment page structure ok, still need to confirm the attendee after the payment 2021-04-15 10:45:44 +02:00
altairis-noe
3fe0eb54c7 association of warehouses to projects 2021-04-15 09:59:08 +02:00
Alexandre SPANGARO
1be8bfe5c0 Text 2021-04-15 06:08:41 +02:00
Alexandre SPANGARO
b2a1b06736 text 2021-04-14 23:19:10 +02:00
Alexandre SPANGARO
957968eea2 typo 2021-04-14 23:17:26 +02:00
Alexandre SPANGARO
140f098c79 NEW: Add constant MAIN_BUGTRACK_URL to add possibility to redirect to other service 2021-04-14 23:16:30 +02:00
Laurent Destailleur
195d3b578b Fix phpcs 2021-04-14 20:44:34 +02:00
Laurent Destailleur
59f1270264 Trans 2021-04-14 19:12:25 +02:00
Laurent Destailleur
63d4d83025 Better text 2021-04-14 15:15:52 +02:00
NextGestion
4e45011e45 Manage Partnership for third-party 2021-04-14 13:59:38 +01:00
Dorian Vabre
55afc59db2 removed useless fetch, moved link to the fetch method of the conferenceorbooth class, wip on service to use on the invoice 2021-04-14 14:33:11 +02:00
Christophe Battarel
ccc05a0a43
Merge branch 'develop' into batch_mask_product 2021-04-14 08:30:19 +02:00
Laurent Destailleur
033a243372
Merge pull request #17166 from altairisfr/product_masks 
Product masks
 2021-04-13 23:06:09 +02:00
Laurent Destailleur
192fcb89d2
Merge pull request #17097 from NextGestion/dolibarr_partnership 
Create Partnership Module
 2021-04-13 16:33:54 +02:00
Laurent Destailleur
3f159fa39f
Merge pull request #17251 from DorianVabre/dev_EventOrganizer 
Dev event organizer: public registration page to a conference
 2021-04-13 15:31:40 +02:00
Dorian Vabre
fa47106ed7 Merge branch 'dev_EventOrganizer' of github.com:DorianVabre/dolibarr into dev_EventOrganizer_payment 2021-04-13 12:21:27 +02:00
Laurent Destailleur
3439bc4a0f Clean code 2021-04-13 11:30:23 +02:00
altairis-noe
eee40a1840 Merge branch 'develop' of github.com:altairisfr/dolibarr into batch_mask_product 2021-04-13 10:36:37 +02:00
altairis-noe
f69ccbbab8 remove empty line 2021-04-13 10:31:24 +02:00
Laurent Destailleur
0d136d6806 Enhance barcode scanner tool 2021-04-13 10:24:57 +02:00
Laurent Destailleur
7004747ca3 Add more tooltips on edition of accounting account 
Fix setup of accountancy

Conflicts:
	htdocs/accountancy/admin/account.php
 2021-04-13 09:51:17 +02:00
Laurent Destailleur
2f77181781 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-13 09:47:18 +02:00
Laurent Destailleur
243fcb38ba Add more tooltips on edition of accounting account 
Fix setup of accountancy
 2021-04-13 09:46:50 +02:00
Dorian Vabre
167da1445d securekey added in 2021-04-12 17:16:24 +02:00
Dorian Vabre
358a2bf365 hardcoded label put in ->trans 2021-04-12 17:10:57 +02:00
Laurent Destailleur
3d681d96c4
Merge pull request #17205 from DorianVabre/dev_EventOrganizer 
new: working on conference or booth object and event type #FoundationFunding
 2021-04-12 16:06:13 +02:00
Dorian Vabre
15d103e957 subs validation for free conferences added 2021-04-12 15:52:49 +02:00
Christophe Battarel
855e736d32
Merge branch 'develop' into product_masks 2021-04-12 11:42:23 +02:00
Laurent Destailleur
35d37c75fc Fix EN Translation 2021-04-11 22:25:22 +02:00
Laurent Destailleur
04081954b1 Fix translation 2021-04-11 22:19:15 +02:00
Laurent Destailleur
3893c69dc1 Enhance perf and security page 2021-04-11 21:30:41 +02:00
Alexandre SPANGARO
451164ba64 Merge remote-tracking branch 'upstream/develop' into 14a26 2021-04-10 21:44:23 +02:00
NextGestion
2035b956a6 Fix Sql & translate files 2021-04-10 10:57:23 +01:00
Dorian Vabre
b3415f9031 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_EventOrganizer 2021-04-09 16:23:42 +02:00
Dorian Vabre
a590f945e9 thirdparty creation OK, wip on conforboothattendee creation 2021-04-09 16:12:25 +02:00
lmarcouiller
19ee78e123 Close #17193 : Move button convert in webp 2021-04-09 15:44:47 +02:00
altairis-noe
000342c2d8 custom masks : create, edit and display 2021-04-09 13:40:37 +02:00
Laurent Destailleur
a50b0e7441 Debug inventory module 2021-04-09 13:15:27 +02:00
NextGestion
d6e4cb7d0b
Merge branch 'develop' into dolibarr_partnership 2021-04-09 12:01:44 +01:00
Laurent Destailleur
06a7b8f5cb
Merge pull request #17159 from Hystepik/develop#1 
Close #17145 : add link to autofill with expected qty
 2021-04-09 12:50:33 +02:00
Laurent Destailleur
44ec5ad12f
Merge pull request #17194 from daraelmin/daraelmin-amountbymebertype 
NEW option to select membership type on the online payment page for membership subscription or renewal
 2021-04-09 12:35:04 +02:00
Laurent Destailleur
afca96a8ee Enhance barcode scanner tool 2021-04-09 12:08:56 +02:00
daraelmin
f2a49ef72f New option amount by member type 2021-04-09 02:23:22 +02:00
Dorian Vabre
60341e8a14 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_EventOrganizer 2021-04-08 17:29:16 +02:00
Dorian Vabre
af5b623b59 securekey added 2021-04-08 16:32:50 +02:00
Laurent Destailleur
5fd9ee20eb
Merge branch 'develop' into develop#4 2021-04-08 15:42:07 +02:00
Laurent Destailleur
638a4a6194
Merge pull request #17161 from Hystepik/develop#3 
Close #17108 : New button to convert images in webp format
 2021-04-08 14:06:45 +02:00
Anthony Berton
f613688b28 add_option 2021-04-08 13:37:09 +02:00
Dorian Vabre
c6d3510e30 form ok, todo : creation of an attendee 2021-04-07 17:16:26 +02:00
Christophe Battarel
05efc85008
Merge pull request #2 from altairis-noe/product_masks 
Product masks
 2021-04-07 16:20:39 +02:00
Florent Peyraud
7be9a98ef0 Add bill tax code article for non profit organization VAT 2021-04-07 13:51:08 +02:00
NextGestion
ace958240d
Merge branch 'develop' into dolibarr_partnership 2021-04-07 12:30:37 +01:00
lmarcouiller
843882c7c7 update stock.lang 2021-04-07 12:46:51 +02:00
lmarcouiller
41db9abff8 Close #17145 : add link to autofill with expected qty 2021-04-07 12:46:28 +02:00
Dorian Vabre
07e018dc7d work in progress 2021-04-07 12:30:08 +02:00
lmarcouiller
0611db68cf add of tooltip 2021-04-07 11:21:41 +02:00
lmarcouiller
49b3970700 Close #17113 : Can upload a favicon in website module 2021-04-07 11:13:14 +02:00
altairis-noe
fc76e06058 Better tooltip, better name, translation 2021-04-07 10:25:30 +02:00
Laurent Destailleur
4ccb27ad40 Work on inventory module 2021-04-07 02:24:15 +02:00
Laurent Destailleur
0219a18a5c trans 2021-04-07 01:27:56 +02:00
Laurent Destailleur
d1df327284 Add tab for import/export profiles 2021-04-06 18:51:43 +02:00
Laurent Destailleur
38f3693fc7 Look and feel v14 2021-04-06 18:18:07 +02:00
Laurent Destailleur
10fb793fb1 Enhance the security page 2021-04-06 13:56:33 +02:00
Laurent Destailleur
767aa605a2 Enhance security page 2021-04-06 13:09:00 +02:00
lmarcouiller
c04387ff3b Close #17108 : New button to convert images in webp format 2021-04-06 11:52:04 +02:00
Laurent Destailleur
2da5d8838d Fix trans 2021-04-05 15:47:35 +02:00
Laurent Destailleur
5769701cd0 Better example 2021-04-05 15:05:21 +02:00
Laurent Destailleur
37db3ffb90
Merge pull request #17065 from Hystepik/develop#1 
Debug feature to import stock movement from csv file
 2021-04-04 01:41:14 +02:00
NextGestion
6cac5f2212 Create Partnership Module 2021-04-03 09:24:07 +01:00
Laurent Destailleur
06078f231b NEW Can show the project ref or label into PDF documents 2021-04-01 13:02:44 +02:00
lmarcouiller
fd6822b202 Debug feature to import stock movement 2021-04-01 09:34:14 +02:00
Laurent Destailleur
6fc70fba8c
Merge pull request #16981 from FHenry/dev_EventOrganisation 
new: working on conference or booth object and event type #FoundationFunding
 2021-03-31 22:29:39 +02:00
Laurent Destailleur
55741506c8
Merge pull request #17053 from aspangaro/14a30 
NEW: Accountancy - Add FEC import
 2021-03-31 22:15:26 +02:00
Laurent Destailleur
0fd36d96f3 Fix report 2021-03-31 21:25:01 +02:00
Florian HENRY
73d7eefdcf Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-31 20:09:44 +02:00
Laurent Destailleur
2af8b7078c Fix turnover calculation was wrong. We must include only 2021-03-31 19:50:43 +02:00
Laurent Destailleur
05d9140f8f Look and feel 2021-03-31 15:28:12 +02:00
Laurent Destailleur
213544e4a7 Fix text 2021-03-31 15:26:34 +02:00
Laurent Destailleur
3face8b1c4 Debug feature to import stock movements from a file. 2021-03-31 15:15:07 +02:00
Laurent Destailleur
fafff6d9a4 Debug feature to import stock movements from a file. 2021-03-31 15:07:18 +02:00
Laurent Destailleur
66385d4ed5
Merge pull request #17059 from Hystepik/develop#3 
new mass stock transfer with an import file
 2021-03-31 14:02:17 +02:00
Hystepik
69c47f1d39
Merge branch 'develop' into develop#3 2021-03-31 12:21:28 +02:00
lmarcouiller
633b8f1431 Close #16761 : Info template import 2021-03-31 12:18:31 +02:00
lmarcouiller
bd092cc84d Close #16761 : new mass stock transfer 2021-03-31 12:04:37 +02:00
lvessiller
4e1b84af45 NEW translate in "en_US" to complete PR 16980 2021-03-31 08:27:27 +02:00
Alexandre SPANGARO
9b65529fc7 NEW: Accountancy - Add FEC import 2021-03-31 04:59:12 +02:00
Laurent Destailleur
38f1710b43
Merge pull request #17020 from Hystepik/develop#1 
Close #4951 : New module Inventory
 2021-03-30 20:43:52 +02:00
Laurent Destailleur
12f14f8bd5
Merge pull request #17021 from bb2a/add_option_warehouse_affect_thirparty 
ADD Option warehouse affect thirparty
 2021-03-30 19:47:19 +02:00
Anthony Berton
96b450a849 20210330 2021-03-30 14:58:47 +02:00
lmarcouiller
55560b7d38 Inventory module working 2021-03-30 12:35:20 +02:00
lvessiller
85fff685db Merge branch 'develop' of github.com:OPEN-DSI/dolibarr into new-propal-signature-date-and-user 2021-03-30 08:19:54 +02:00
lvessiller
d0ce60ff49 Merge branch 'develop' of github.com:OPEN-DSI/dolibarr into new-propal-signature-date-and-user 2021-03-30 08:04:19 +02:00
Florian HENRY
11dcf656c6 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-29 20:30:31 +02:00
Laurent Destailleur
715490be0b
Merge pull request #16929 from aspangaro/14a28 
NEW: Add company info in dropdown login menu
 2021-03-29 19:02:12 +02:00
Florian HENRY
e18c010490 fix bug on list 2021-03-29 16:25:34 +02:00
Florian HENRY
f25360cc4c Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-29 15:49:43 +02:00
lmarcouiller
966d3a6f30 add setrecorded and commit to db 2021-03-29 15:18:34 +02:00
Laurent Destailleur
6bc56b7671 Look and feel v14 2021-03-29 13:41:28 +02:00
Laurent Destailleur
b929641fe1 Look and feel v14 2021-03-29 13:00:17 +02:00
Florian HENRY
5fe6aa429d Merge branch 'dev_EventOrganisation_draft' into dev_EventOrganisation 2021-03-29 12:08:02 +02:00
Florian HENRY
2def98809c Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-29 11:55:26 +02:00
Laurent Destailleur
a2c2d46e5c Fix loosing html content in edit 2021-03-27 15:22:48 +01:00
Laurent Destailleur
ef4f8fd585 Lang 2021-03-27 14:02:30 +01:00
Alexandre SPANGARO
c1ceefb70f Update with new functionality 2021-03-27 04:44:20 +01:00
Alexandre SPANGARO
6809dab2c0 Merge remote-tracking branch 'upstream/develop' into 14a28 2021-03-27 04:12:15 +01:00
Florian HENRY
aa9d4342cd fix translation 2021-03-26 20:18:22 +01:00
Florian HENRY
7a6cc742a6 fix translation 2021-03-26 19:57:20 +01:00
Florian HENRY
6399423526 fix translation 2021-03-26 19:56:06 +01:00
Florian HENRY
47675d28d7 add filter for select list attendees 2021-03-26 19:47:48 +01:00
Florian HENRY
a254bbcc02 fix translation 2021-03-26 19:05:55 +01:00
Florian HENRY
a8b486c7b9 fix error translation 2021-03-26 19:00:56 +01:00
Florian HENRY
f87711bf2f Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-26 18:30:08 +01:00
lvessiller
8a2e49d6e7 NEW date and user signature on proposal (Issue 16062) 2021-03-26 17:44:41 +01:00
Laurent Destailleur
77bb5b78b6 Show swagger json file of APIs 2021-03-26 13:57:16 +01:00
Laurent Destailleur
ff52b1ee41
Merge pull request #16620 from altairisfr/pr_batch_masks 
Define Masks for Batch Products Equipments
 2021-03-25 08:36:36 +01:00
Laurent Destailleur
57662e60a4 Better explanation of internal/external user 2021-03-25 02:11:54 +01:00
Laurent Destailleur
eeba9e4d50 Code comment 2021-03-24 21:58:06 +01:00
Laurent Destailleur
965ee16270 Fix typo 2021-03-24 21:53:56 +01:00
Laurent Destailleur
21a9779fe2 FIX inconsistency in margin recording with option "Force to sale price" 2021-03-24 21:49:45 +01:00
Florian HENRY
373a52063d add commit 2021-03-24 20:13:30 +01:00
Alexandre SPANGARO
34abb53c25 Merge remote-tracking branch 'upstream/develop' into 14a28 2021-03-24 14:09:46 +01:00
Laurent Destailleur
4015f5952e Look and feel v14 2021-03-24 12:51:14 +01:00
Laurent Destailleur
37c04b794f Add property "ticket group is public" in dicitonary of ticket groups. 2021-03-24 12:13:23 +01:00
Laurent Destailleur
367ff3c9f0 Look and feel v14 2021-03-24 01:53:08 +01:00
Florian HENRY
ebe0b503f6 working on attendees 2021-03-23 22:12:20 +01:00
Florian HENRY
d043c8f4ba Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-23 21:05:11 +01:00
Florian HENRY
cc78e7c685 add field on conf or booth tabs 2021-03-23 21:04:38 +01:00
Laurent Destailleur
053fe4831a Fix translations 2021-03-23 16:59:12 +01:00
Florian HENRY
edf7c02dd6 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-23 11:45:24 +01:00
Florian HENRY
bc1a412d1b ongoing 2021-03-23 11:45:17 +01:00
Laurent Destailleur
e3b019f923 Clean code 2021-03-23 01:32:17 +01:00
Laurent Destailleur
df9546662a Fix trans 2021-03-22 16:18:31 +01:00
Laurent Destailleur
897d653144 Debug default date for vat reports 2021-03-22 16:09:18 +01:00
Alexandre SPANGARO
98e482de71 Add text for popup 2021-03-22 06:53:09 +01:00
Laurent Destailleur
f1fb7e732e Fix trans 2021-03-22 00:07:35 +01:00
Alexandre SPANGARO
17e0cc4bad Merge remote-tracking branch 'upstream/develop' into 14a28 2021-03-21 22:59:41 +01:00
Alexandre SPANGARO
ea938f64da NEW: Add company info in dropdown login menu 2021-03-21 22:58:21 +01:00
Laurent Destailleur
e16b7fe1ee Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-03-21 21:29:23 +01:00
Laurent Destailleur
c69ad6ee8b Update setup page 2021-03-21 21:29:11 +01:00
Laurent Destailleur
0f9b88d828
Merge pull request #16899 from daraelmin/daraelmin-status-exclu 
Close #16255 Add new status "excluded" in membership management module
 2021-03-21 20:56:07 +01:00
Laurent Destailleur
3c8bf2167b Debug permissions 2021-03-21 18:01:43 +01:00
daraelmin
054864eccc Merge branch 'develop' into daraelmin-status-exclu 2021-03-21 14:42:01 +01:00
daraelmin
e910810037 activate exlcude button 2021-03-21 14:38:15 +01:00
Laurent Destailleur
af199189b3 NEW Add color and picto for direction of movement 2021-03-21 13:46:01 +01:00
Laurent Destailleur
5ecef1bad3
Merge pull request #16739 from altairisfr/pr_searchbatch 
NEW Add search on lots or serials into quick search bar
 2021-03-18 23:43:23 +01:00
Laurent Destailleur
46972ec669 FIx #5660 2021-03-18 14:34:44 +01:00
Frédéric FRANCE
29f55fbeac
fix typo 2021-03-16 17:12:31 +01:00
Christophe Battarel
f59c19b573 search on lots or serials 2021-03-16 16:50:59 +01:00
Laurent Destailleur
8246eb814b Enhance the page for security advices 2021-03-16 16:02:15 +01:00
Florian HENRY
17c49e6ce9 ongoinf card and list 2021-03-15 18:06:23 +01:00
Laurent Destailleur
85eaec48e1
Merge pull request #16307 from aspangaro/14a15 
NEW: VAT report - Optimisation & collapse by rate
 2021-03-15 11:56:06 +01:00
Christophe Battarel
090dc4f28a
Merge branch 'develop' into pr_batch_masks 2021-03-15 11:42:33 +01:00
Laurent Destailleur
a79c9a9019 Fix help of an option 2021-03-12 12:07:38 +01:00
Christophe Battarel
ba51c5dc70 differentiate masks for lot management and serial numbers management 2021-03-11 10:44:55 +01:00
Laurent Destailleur
8bdc80918b trans 2021-03-10 18:57:24 +01:00
Laurent Destailleur
c2200e6ffd Clean code 2021-03-10 16:41:48 +01:00
Laurent Destailleur
514a9fb96a
Merge pull request #16561 from Hystepik/develop#1 
Close #15917 : Improvement to ticket module
 2021-03-10 15:49:20 +01:00
Laurent Destailleur
9ed128c6fa Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/account.php
	htdocs/core/class/html.formaccounting.class.php
	htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
	htdocs/langs/en_US/errors.lang
	htdocs/product/card.php
 2021-03-10 15:35:09 +01:00
Laurent Destailleur
680f6257a0 FIX warning if setup of chart of account is not yet done. 2021-03-10 11:04:28 +01:00
Laurent Destailleur
a79a4e876d
Merge branch 'develop' into boxindex 2021-03-08 16:34:05 +01:00
lmarcouiller
b71a8c5d6f Close #15917 : boxes on ticket index 2021-03-08 15:26:35 +01:00
lmarcouiller
d8a74bad93 update for continuous integration 2021-03-08 13:58:23 +01:00
lmarcouiller
8c7764ed5d Move of 2 graph in boxes 2021-03-08 12:18:55 +01:00
Laurent Destailleur
c0e0300eb3 Enhance the page security 2021-03-08 11:08:58 +01:00
lmarcouiller
f627637490 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1 2021-03-08 10:15:00 +01:00
Alexandre SPANGARO
2f86971f84 Merge remote-tracking branch 'upstream/develop' into 14a15 2021-03-08 09:56:57 +01:00
Laurent Destailleur
315e66aa5a
Merge pull request #16537 from altairisfr/pr_sn_unicity 
Unique serial number management
 2021-03-06 11:22:44 +01:00
Laurent Destailleur
cbd6357f45
Merge pull request #16556 from marc-dll/NEW_ldap_group_filter 
NEW: LDAP: usergroup search can be filtered
 2021-03-06 11:08:24 +01:00
Laurent Destailleur
3cbced439a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/tools/listevents.php
	htdocs/compta/bank/line.php
	htdocs/compta/facture/class/facture-rec.class.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/compta/paiement/cheque/card.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/lib/date.lib.php
	htdocs/core/lib/ticket.lib.php
	htdocs/core/modules/mailings/modules_mailings.php
	htdocs/core/tpl/extrafields_view.tpl.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/cron/list.php
	htdocs/expedition/card.php
	htdocs/mrp/mo_list.php
	htdocs/product/stock/productlot_card.php
	htdocs/public/emailing/mailing-read.php
	htdocs/public/emailing/mailing-unsubscribe.php
	htdocs/ticket/list.php
	test/phpunit/FactureRecTest.php
 2021-03-05 19:29:09 +01:00
lmarcouiller
7ab1e0d9a0 Fix #15917 : Improvement to ticket module 2021-03-05 14:28:23 +01:00
Marc de Lima Lucio
f731545af4 NEW: ldap: filter search on usergroups 2021-03-05 11:14:21 +01:00
Laurent Destailleur
83df996bc2 Fix english translation 2021-03-05 09:52:25 +01:00
Christophe Battarel
acea36acf2 better check for unicity 2021-03-05 08:39:30 +01:00
Laurent Destailleur
aee6d78928 Debug split of payment salary into salary + payment 2021-03-04 21:33:29 +01:00
Laurent Destailleur
b92bfb007f
Merge pull request #16520 from FHenry/dev_EventOrganisation 
new: working on conference or booth object and event type #FoundationFunding
 2021-03-04 17:06:57 +01:00
Laurent Destailleur
7d20df8054
Merge pull request #16177 from atm-gauthier/NEW/add_real_payments_on_salaries 
NEW Salary payment request and Salary payment are 2 different steps in workflow on Salary payment recording
 2021-03-04 16:53:54 +01:00
Laurent Destailleur
dcff298c5f FIX #16533 2021-03-04 15:57:03 +01:00
Christophe Battarel
6a242edd8b check unicity of serial number 2021-03-04 15:29:47 +01:00
Gauthier PC portable 024
845b1c6c94 Merge branch 'NEW/12.0_new_payments_on_salaries' of github.com:ATM-Consulting/dolibarr into NEW/add_real_payments_on_salaries 2021-03-03 14:35:38 +01:00
Alexandre SPANGARO
59a2fb8ed5 Merge remote-tracking branch 'upstream/develop' into 14a15 2021-03-03 14:08:40 +01:00
Frédéric FRANCE
22bc3b879b
new box replace 2021-03-02 22:21:34 +01:00
Frédéric FRANCE
d68de8617b
new box replace 2021-03-02 22:00:09 +01:00
Florian HENRY
6862c206aa merge from develop 2021-03-02 21:48:35 +01:00
Frédéric FRANCE
6cf8a46095
Merge remote-tracking branch 'upstream/develop' into boxindex 2021-03-02 20:41:01 +01:00
Laurent Destailleur
42329b10c9 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	build/generate_filelist_xml.php
	htdocs/comm/propal/card.php
	htdocs/commande/card.php
	htdocs/compta/facture/card.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/lib/modulebuilder.lib.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
	htdocs/supplier_proposal/card.php
	htdocs/ticket/list.php
 2021-03-02 15:27:20 +01:00
Laurent Destailleur
f219c9454a
Merge pull request #16251 from Hystepik/develop#5 
Close #16218 : new button sitemap file
 2021-03-02 14:56:10 +01:00
Laurent Destailleur
cffea1889f FIX #16325 2021-03-02 01:17:28 +01:00
Frédéric FRANCE
3b428004d8
Merge remote-tracking branch 'upstream/develop' into boxindex 2021-03-02 00:09:44 +01:00
Florian HENRY
1b57d2a4a0 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_conf_defaulteventstatus 2021-03-01 19:57:54 +01:00
Laurent Destailleur
222012da37 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/class/paymentvarious.class.php
	htdocs/compta/bank/various_payment/card.php
	htdocs/don/card.php
	htdocs/langs/en_US/main.lang
	htdocs/public/payment/newpayment.php
	test/phpunit/DateLibTzFranceTest.php
 2021-03-01 15:48:30 +01:00
Laurent Destailleur
b2cfc431bc
Merge pull request #16489 from aspangaro/13p7 
FIX: Total_ht not show in contract link element
 2021-03-01 14:07:29 +01:00
Laurent Destailleur
5cddd0465c Fix trans 2021-03-01 13:25:54 +01:00
Frédéric FRANCE
8c45137b37
Merge remote-tracking branch 'upstream/develop' into boxindex 2021-03-01 12:55:45 +01:00
Laurent Destailleur
81f1bee10c Fix option DONATION_USE_THIRDPARTIES 2021-03-01 11:18:14 +01:00
Gauthier PC portable 024
6da28f5e44 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-03-01 11:12:03 +01:00
Laurent Destailleur
a68721c5b4 Fix missing translation 2021-03-01 10:58:06 +01:00
Hystepik
460bc2dbde
Merge branch 'develop' into develop#5 2021-03-01 09:03:38 +01:00
Alexandre SPANGARO
3b1a9cd668 FIX: Total_ht not show in contract link element 2021-03-01 03:18:14 +01:00
Alexandre SPANGARO
0d954cb1c7 FIX: Total_ht not show in contract link element 2021-03-01 03:09:36 +01:00
Alexandre SPANGARO
ad95caac7e
Merge branch 'develop' into 14a15 2021-02-28 07:12:24 +01:00
Alexandre SPANGARO
6e1d67084d Merge remote-tracking branch 'upstream/develop' into 14a15 2021-02-28 07:09:30 +01:00
Laurent Destailleur
747acd6764 Trans 2021-02-27 18:53:27 +01:00
Florian HENRY
eb17ae5fe2 fix event type select 2021-02-27 14:13:42 +01:00
Laurent Destailleur
34d00e5d5e Look and feel v14 2021-02-27 02:44:52 +01:00
Laurent Destailleur
84219689a6 Look and feel v14 2021-02-27 02:00:00 +01:00
atm-lena
292076e5dd Ajout conf qui permet de décocher / cocher par défaut le paiement automatique des salaires 2021-02-26 15:59:27 +01:00
Gauthier PC portable 024
e598b49545 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-26 15:33:36 +01:00
Laurent Destailleur
c4e98486f7 Trans 2021-02-26 15:15:55 +01:00
Laurent Destailleur
b95fd1697f
Merge pull request #16434 from altairisfr/serials_pr 
differentiate serial numbers from lot management
 2021-02-26 15:06:35 +01:00
Christophe Battarel
4aaf9e133a change translation 2021-02-26 11:51:23 +01:00
Christophe Battarel
a61fa2b049 differentiate serial numbers from lot management 2021-02-25 15:15:00 +01:00
Alexandre SPANGARO
e177ac566c Merge remote-tracking branch 'upstream/develop' into 14a15 2021-02-25 05:02:03 +01:00
Nicolas
49c0967a3e NEW option for Takepos to show the total price without tax 2021-02-24 15:48:15 +01:00
Gauthier PC portable 024
c0160a5f3b Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-23 15:20:15 +01:00
Gauthier PC portable 024
4f767c0823 Merge branch 'NEW/12.0_new_payments_on_salaries' of github.com:ATM-Consulting/dolibarr into NEW/add_real_payments_on_salaries 2021-02-23 15:18:44 +01:00
Gauthier PC portable 024
a767bffc3a FIX : correction of payment salaries list on employee tab of user card 2021-02-23 15:08:27 +01:00
Laurent Destailleur
0009ce1646 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-23 14:49:23 +01:00
Laurent Destailleur
888c072af0 NEW Can set a percentage when creating an invoice from another object 2021-02-23 14:48:54 +01:00
Florian HENRY
fa65956801 Merge branch 'develop' into dev_EventOrganisation_draft 2021-02-22 21:02:22 +01:00
Laurent Destailleur
f6080d45fa Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-22 16:21:26 +01:00
Laurent Destailleur
912f9f9bdb Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/contact/card.php
	htdocs/core/actions_massactions.inc.php
 2021-02-22 15:54:24 +01:00
Laurent Destailleur
c010cab47e Fix translation of default value for contacts 2021-02-22 15:51:00 +01:00
Gauthier PC portable 024
939d406ab1 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-22 09:10:24 +01:00
Florian HENRY
be34fb4541 tab event ok 2021-02-21 12:32:16 +01:00
Florian HENRY
556ba2b369 statart card 2021-02-20 23:17:48 +01:00
Laurent Destailleur
3ab80469ae Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-19 16:11:36 +01:00
Laurent Destailleur
574c0df427
Merge pull request #16338 from aspangaro/13p5 
Fix module asset in development
 2021-02-19 16:05:35 +01:00
Laurent Destailleur
e2b469dee4
Update admin.lang 2021-02-19 15:54:30 +01:00
Laurent Destailleur
70e2d1dbbd
Merge branch 'develop' into dev_EventOrganisation_ProjectCardAndList 2021-02-19 12:54:38 +01:00
Laurent Destailleur
fc9d6cef97 Enhancement Auto and manual calendar. Better separation. 2021-02-18 11:16:36 +01:00
Gauthier PC portable 024
134d7e00ec Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-17 16:56:50 +01:00
Laurent Destailleur
cc3ae59f3f
Merge pull request #16312 from ATM-Consulting/new/14.0_auto_close_project_when_all_tasks_done 
NEW option to automatically close an open project when all its tasks …
 2021-02-16 20:14:51 +01:00
Laurent Destailleur
c569c503f7 Fix label 2021-02-16 19:59:42 +01:00
Florian HENRY
02a2610432 NEW: Conf for default actiomm status when created from card 2021-02-16 19:22:36 +01:00
Florian Mortgat
186dcab1b7 Merge branch 'NEW/12.0_new_payments_on_vat' of github.com:ATM-Consulting/dolibarr into NEW/14.0_new_payments_on_vat_default_checkbox_value 2021-02-16 16:28:14 +01:00
Florian Mortgat
363fe1f52f NEW 12.0: option to leave the "Automatically create a total payment" checkbox empty on the tax creation page 2021-02-16 15:44:24 +01:00
Florian Mortgat
0f68b69383 NEW option to automatically close an open project when all its tasks are done (=progress 100%) 2021-02-16 14:11:21 +01:00
Laurent Destailleur
61b153692c Fix tooltip on permissions of website 2021-02-16 12:38:40 +01:00
Laurent Destailleur
6f909bb32a Fix tooltip on permissions of website 2021-02-16 12:32:03 +01:00
Laurent Destailleur
6f25f7c2cb Clean code 2021-02-16 11:43:26 +01:00
Alexandre SPANGARO
8079105aaf NEW: VAT report - Optimisation & collapse by rate 2021-02-16 04:28:55 +01:00
Laurent Destailleur
0bac454f25 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-15 16:40:45 +01:00
Laurent Destailleur
8b34c29be9 Fix translation 2021-02-15 16:39:30 +01:00
Laurent Destailleur
7b383b58c6 Trans 2021-02-15 16:35:51 +01:00
Laurent Destailleur
d183a7eedf
Merge pull request #16288 from FHenry/dev_EventOrganisation_setuppage 
wip : Event Organization module - PR-1 - setup page  #FoundationFunding
 2021-02-15 15:59:19 +01:00
Laurent Destailleur
b98a654321 NEW The setup for mandatory field can be done on combo list too. 2021-02-15 15:37:43 +01:00
Laurent Destailleur
7e7d393f30 Look and feel v14 2021-02-15 14:19:05 +01:00
Laurent Destailleur
026259ebd7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/ajax.lib.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/product/fournisseurs.php
 2021-02-15 13:12:27 +01:00
Florian HENRY
649517fc99 Merge branch 'dev_EventOrganisation_setuppage' into dev_EventOrganisation_ProjectCardAndList 2021-02-15 12:18:32 +01:00
Florian HENRY
f186e7bf4b project list and card ok 2021-02-15 12:18:08 +01:00
Florian HENRY
1427f66e10 Merge branch 'dev_EventOrganisation' into dev_EventOrganisation_setuppage 2021-02-15 11:20:07 +01:00
Florian HENRY
e1f503a8cf Merge branch 'develop' into dev_EventOrganisation 2021-02-15 11:19:08 +01:00
Laurent Destailleur
f4c23654f8 FIX #16275 #15604 2021-02-14 22:44:04 +01:00
Laurent Destailleur
fac38e50d6 Fix #16256 2021-02-14 22:16:15 +01:00
Florian HENRY
5d8aaefb26 fix indent 2021-02-14 17:12:36 +01:00
Florian HENRY
b5055a5edb config pages ok 2021-02-14 16:41:57 +01:00
Florian HENRY
07984d9a6e Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-02-14 15:02:29 +01:00
Florian HENRY
d7dfb9138a working on setup 2021-02-14 15:00:20 +01:00
Laurent Destailleur
50797bf892 Fix typo 2021-02-12 17:17:48 +01:00
Laurent Destailleur
cd4d790d2b Add parameters of batch into comment description 2021-02-12 17:15:23 +01:00
Florian HENRY
13522fdf5f start module dev 2021-02-11 17:05:04 +01:00
lmarcouiller
40b20d510d fix to fix PR 2021-02-11 10:05:40 +01:00
lmarcouiller
484b406985 Add website url form 2021-02-10 10:41:13 +01:00
lmarcouiller
1ae3b151c8 Add new button to generate sitemap 2021-02-10 09:11:53 +01:00
Laurent Destailleur
d80f23589d Fix missing entry 2021-02-10 02:39:58 +01:00
Laurent Destailleur
1c99eaedbc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-09 14:00:11 +01:00
Laurent Destailleur
4a97690f78 Add a check on syntax of hostname for email colector 2021-02-09 13:59:00 +01:00
Laurent Destailleur
3d892bd60b
Merge pull request #15735 from FHenry/dev_new_project_task_add_contact 
NEW: When add contact/user to Project, ask to also affect on Tasks
 2021-02-09 13:43:08 +01:00
Gauthier PC portable 024
d106fe7e90 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-09 09:50:46 +01:00
Gauthier PC portable 024
41af1a59f4 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-08 10:37:01 +01:00
Gauthier PC portable 024
e2a73e6c88 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_vat_objects 2021-02-08 09:46:48 +01:00
Alexandre SPANGARO
b8ea96ba57 Fix module asset in development 2021-02-08 05:39:07 +01:00
Laurent Destailleur
fd3354142b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/categories/viewcat.php
 2021-02-06 01:17:05 +01:00
Laurent Destailleur
c6badeed57 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/categories/viewcat.php
	htdocs/compta/prelevement/card.php
 2021-02-06 01:14:48 +01:00
Laurent Destailleur
4428e2b18e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/compta/prelevement/card.php
	htdocs/product/price.php
 2021-02-06 01:08:37 +01:00
Laurent Destailleur
87c8d917e9 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/compta/prelevement/card.php
 2021-02-06 01:03:31 +01:00
Laurent Destailleur
9843e79bac Trans 2021-02-05 15:43:03 +01:00
Gauthier PC portable 024
d93c71a42f Merge branch '12.0_new_payments_on_salaries' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_salaries 2021-02-05 12:28:15 +01:00
Gauthier PC portable 024
e6bea60409 FIX : bank_url 2021-02-05 12:27:14 +01:00
Florian Mortgat
3f862bf43e FIX 10.0 - before crediting a withdrawal receipt, check whether it has been credited already 2021-02-05 11:34:39 +01:00
Gauthier PC portable 024
df8ca1ef84 Merge branch '12.0_new_payments_on_salaries' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_salaries 2021-02-05 09:29:20 +01:00
Laurent Destailleur
49470ea216 Trans 2021-02-05 00:56:44 +01:00
Gauthier PC portable 024
e188ec6cd7 NEW : add real payments on salaries objects 2021-02-04 17:21:08 +01:00
Laurent Destailleur
eee49b9132 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/delais.php
 2021-02-04 13:50:07 +01:00
Laurent Destailleur
eca010937f FIX Trigger on expense report was not fired 
FIX Bad dates on info tabs
 2021-02-04 11:56:53 +01:00
Laurent Destailleur
369a835abb
Merge pull request #16151 from bb2a/mass_action_propal_nosigned 
NEW: add massActions to set a commercial proposal to status "Refused"
 2021-02-03 20:36:10 +01:00
Anthony Berton
eb15c4d800 20200203 2021-02-03 11:29:54 +01:00
Laurent Destailleur
4d029194d3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/ajax.lib.php
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
 2021-02-02 13:22:23 +01:00
Laurent Destailleur
f4f9a7c461 Clean page of info tools 2021-02-02 09:44:51 +01:00
Gauthier PC portable 024
1eb4968a29 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_vat_objects 2021-02-01 12:00:04 +01:00
Laurent Destailleur
b349290cd1 Fix test for date in future 2021-01-31 12:57:54 +01:00
Laurent Destailleur
b24aac1e6b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
 2021-01-31 12:03:39 +01:00
Laurent Destailleur
215e36bb2e Fix typo 2021-01-29 11:19:33 +01:00
Laurent Destailleur
ce3279c462 NEW Add function showValueWithCopyAndPasteButton() to add a copy/paste 
button on a text.
 2021-01-28 12:34:54 +01:00
Laurent Destailleur
4fbf2fff6f
Merge pull request #16034 from Hystepik/develop#2 
Close #16027 New Feature copy Code Client
 2021-01-28 11:17:10 +01:00
Gauthier PC portable 024
8a5588e518 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_vat_objects 2021-01-28 10:28:36 +01:00
Laurent Destailleur
a4c0459c1e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/user/list.php
 2021-01-27 21:09:01 +01:00
Frédéric FRANCE
7cd698aff9
Merge remote-tracking branch 'upstream/develop' into boxindex 2021-01-26 20:19:49 +01:00
Laurent Destailleur
19dd36aa59 Trans 2021-01-26 11:45:29 +01:00
Laurent Destailleur
6313fb8be0 Fix lang 2021-01-26 11:38:07 +01:00
Laurent Destailleur
c417f730b9 Clean language file 2021-01-26 11:31:48 +01:00
Alexandre SPANGARO
94d4f2da8e Missing language key & error translation 2021-01-26 05:14:01 +01:00
Laurent Destailleur
b4be97ec15 Draft code 2021-01-25 18:59:04 +01:00
Laurent Destailleur
21dccadb3a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/banks.lang
	htdocs/stripe/class/stripe.class.php
 2021-01-24 15:32:39 +01:00
Laurent Destailleur
0f5fc7353e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/index.php
	htdocs/admin/mailing.php
	htdocs/admin/paymentbybanktransfer.php
	htdocs/admin/prelevement.php
	htdocs/modulebuilder/template/admin/setup.php
 2021-01-24 15:29:53 +01:00
Laurent Destailleur
7365974594 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/langs/en_US/banks.lang
	htdocs/stripe/class/stripe.class.php
 2021-01-24 15:24:56 +01:00
Laurent Destailleur
b4783f69d6 Show if permission is an advanced permission 2021-01-23 18:13:50 +01:00
Laurent Destailleur
f7e637a552 Trans 2021-01-23 17:40:14 +01:00
Laurent Destailleur
2acf2353a3 Fix bad link 2021-01-23 12:16:25 +01:00
Laurent Destailleur
599d69b07c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-22 13:40:08 +01:00
Laurent Destailleur
e1b6f33894 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contact/card.php
	htdocs/contact/class/contact.class.php
	htdocs/langs/fr_FR/stocks.lang
	htdocs/modulebuilder/template/myobject_list.php
 2021-01-22 13:40:00 +01:00
Laurent Destailleur
79fb672674 Sync transifex 2021-01-22 01:47:29 +01:00
Laurent Destailleur
8e5b971c49
Merge pull request #15918 from zuiko/patch-1 
Fix #15633: Product creation: EAN13 barcode automatic generation incompatible with EAN13 existing barcode scanning, unusable function.
 2021-01-21 13:33:47 +01:00
lmarcouiller
b2809e4ee2 add trans to copied to clipboard text 2021-01-21 09:54:26 +01:00
Laurent Destailleur
79308b332b Trans 2021-01-20 11:41:17 +01:00
Frédéric FRANCE
e8c4db2188
Merge remote-tracking branch 'upstream/develop' into boxindex 2021-01-19 11:36:59 +01:00
Laurent Destailleur
2c6d11e040 When creating invoice by mass action, message has link to invoice 2021-01-19 10:42:43 +01:00
Gauthier PC portable 024
e2abbbcece Merge branch '12.0_new_payments_on_vat' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_vat_objects 2021-01-19 08:57:24 +01:00
Gauthier PC portable 024
2cfaf5fbd6 NEW : add real payments on vat objects 2021-01-18 17:08:17 +01:00
Laurent Destailleur
f95bf56c15 Fix translation 2021-01-18 15:24:50 +01:00
Frédéric FRANCE
c8d1410e33
Merge remote-tracking branch 'upstream/develop' into boxindex 2021-01-16 21:06:12 +01:00
Laurent Destailleur
87d16c56e7
Merge pull request #15977 from frederic34/TotalAmountOfdirectDebitOrderDiffersFromSumOfLines 
add missing translation
 2021-01-16 17:28:20 +01:00
Laurent Destailleur
d592a5d669 Trans 2021-01-16 16:47:38 +01:00
Laurent Destailleur
04e669ec96 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formfile.class.php
	htdocs/langs/fr_FR/other.lang
 2021-01-16 15:38:34 +01:00
Laurent Destailleur
064b00e979 Sync transifex 2021-01-16 15:33:47 +01:00
Frédéric FRANCE
871f762546
Merge remote-tracking branch 'upstream/develop' into boxindex 2021-01-16 13:58:27 +01:00
Laurent Destailleur
ba37396af2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-15 14:36:32 +01:00
Laurent Destailleur
e8ed6a9f09 Trans 2021-01-15 14:33:26 +01:00
Laurent Destailleur
828f1c8314 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/card.php
 2021-01-15 14:04:22 +01:00
Laurent Destailleur
c3046326cb Fix help 2021-01-15 12:42:40 +01:00
Laurent Destailleur
16d98d2691 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/fr_FR/admin.lang
	htdocs/projet/graph_opportunities.inc.php
	htdocs/user/class/usergroup.class.php
 2021-01-14 14:09:09 +01:00
Laurent Destailleur
768d2db8a1 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/langs/fr_FR/admin.lang
	htdocs/projet/graph_opportunities.inc.php
	htdocs/user/class/usergroup.class.php
 2021-01-14 13:43:48 +01:00
Laurent Destailleur
ea47a55144 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-01-14 12:59:27 +01:00
Laurent Destailleur
1cf86931b3 Fix graph of opportunity when a status has been removed. 2021-01-14 12:58:50 +01:00
Frédéric FRANCE
271378fb87
add translation 2021-01-13 18:09:57 +01:00
Frédéric FRANCE
a5678147dd
add missing translation 2021-01-13 16:52:32 +01:00
Laurent Destailleur
b7402ecf3f
Merge branch 'develop' into NEW_product_customer_price_ref 2021-01-13 13:38:19 +01:00
Frédéric FRANCE
e2c57584b7
Merge remote-tracking branch 'upstream/develop' into boxindex 2021-01-12 23:47:24 +01:00
Marc de Lima Lucio
82b0f18378 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_product_customer_price_ref 2021-01-12 15:10:15 +01:00
Laurent Destailleur
c2187b2ff1
Merge branch 'develop' into develop_new_workstation 2021-01-11 17:59:13 +01:00
Laurent Destailleur
cae9dc3acf
Merge pull request #15925 from FHenry/dev_add_tag_contact_thirdpartycontactcreateion 
NEW : Add contact tag and bulk email status on thirparty+contact create form
 2021-01-11 17:28:12 +01:00
Laurent Destailleur
df3034d13a
Merge branch 'develop' into patch-1 2021-01-11 17:15:46 +01:00
Laurent Destailleur
8a3a59dfca
Merge pull request #15636 from aspangaro/14a5 
NEW: Accountancy - Introduce "Level3" - Define account directly in thirdparty
 2021-01-11 17:10:03 +01:00
atm-lena
f17474a8de 12.0 FIX Translation Permission777 FR 2021-01-11 16:56:19 +01:00
Laurent Destailleur
307d718e82
Merge pull request #15931 from ATM-Nicolas/new_shipping_workflow 
NEW : Workflow to set a shipment as closed
 2021-01-11 16:34:26 +01:00
Gauthier PC portable 024
8dfb088fc5 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_workstation 2021-01-11 10:34:38 +01:00
Anthony Berton
d3fa8b9f20 20210110 2021-01-10 01:07:27 +01:00
Laurent Destailleur
f411b29b28 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/listbysubaccount.php
	htdocs/langs/en_US/main.lang
	htdocs/langs/fr_FR/accountancy.lang
 2021-01-09 02:34:43 +01:00
ATM-Nicolas
5a6e4f54f0 NEW : Workflow to set a shipment as closed 2021-01-08 16:25:54 +01:00
Laurent Destailleur
69c614ec2a Sync transifex 2021-01-08 11:22:11 +01:00
Alexandre SPANGARO
9fa23dea49 Add missing language key 2021-01-07 17:39:38 +01:00
Florian HENRY
8adfe54949 bulk email management 2021-01-07 17:33:57 +01:00
Laurent Destailleur
6da3ed1a51 Merge 2 exclusive options into 1 2021-01-07 12:39:51 +01:00
Laurent Destailleur
26fa8b45ac
Merge pull request #15153 from FHenry/dev_new_add_desc_when_select_product 
NEW: preload product description on selection for customer propal/order/invoice
 2021-01-07 11:19:53 +01:00