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

12755 Commits

Author SHA1 Message Date
Frédéric FRANCE
4d0322b485
fix missing translation 2022-12-02 14:41:28 +01:00
Laurent Destailleur
48a423d5e3 Doc 2022-12-01 21:09:27 +01:00
VESSILLER
d5e6c08319 NEW operation type in email collector to load or create contact 2022-12-01 16:50:32 +01:00
Florian HENRY
8202bc6930 NEW: Notification for Sign or Refused Propal from Online Page 2022-12-01 13:56:14 +01:00
Florian HENRY
85c69694e3 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_add_OrderNotificationTriggers 2022-12-01 13:30:59 +01:00
Laurent Destailleur
5125e42a0c Tooltip 
Try to fix blocking pb with country where default vat is not higher rate
 2022-12-01 12:01:48 +01:00
Laurent Destailleur
e5176a78f5 Need 2 different translations for Debit-Credit in some pages for Italia 2022-11-30 18:56:16 +01:00
Laurent Destailleur
5905c0e89e Fix error message 2022-11-30 17:37:29 +01:00
Laurent Destailleur
3143175349 Trans 2022-11-30 12:52:58 +01:00
Florian HENRY
c101acb3ce Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_add_OrderNotificationTriggers 2022-11-30 08:16:53 +01:00
Laurent Destailleur
c97c185368 Protect dynamic php content with installmodules.lock 2022-11-29 18:01:27 +01:00
hystepik
71090cbdd8 test to do 2022-11-28 14:57:51 +01:00
hystepik
bae0a01294 modif public page 2022-11-28 11:06:36 +01:00
Laurent Destailleur
175cdf3668
Merge pull request #22983 from EchoLoGeek/#21771 
#21771
 2022-11-26 00:10:27 +01:00
EchoLoGeek
3b9122bada
Update main.lang 2022-11-25 22:37:13 +01:00
Laurent Destailleur
1c53d32ba0
Merge pull request #22969 from Hystepik/develop#4 
Fix : Yogosha#12007 add protection in dol_add_file_process
 2022-11-25 22:00:13 +01:00
hystepik
50d525ed70 Fix : Yogosha#12007 2022-11-25 17:20:39 +01:00
Laurent Destailleur
b04d4dd867
Merge pull request #22689 from bb2a/NEW---Compléte-function-pdfBuildThirdpartyName-to-use-company-name-of-contact 
NEW Make option PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME visible
 2022-11-25 16:49:35 +01:00
Laurent Destailleur
64950e9d8c
Merge pull request #22832 from bb2a/NEW---Shipping-address-to-invoice 
NEW - Shipping address to invoice
 2022-11-25 16:16:00 +01:00
Alexandre SPANGARO
8dff478f39 Merge remote-tracking branch 'upstream/develop' into 17b11 2022-11-25 04:51:14 +01:00
VESSILLER
fcc7965a78 FIX resolve conflicts 2022-11-24 15:04:12 +01:00
Alexandre SPANGARO
016a74e98b Language key missing 2022-11-24 03:58:34 +01:00
Florian HENRY
0b4d8775b4 add good text 2022-11-23 14:00:24 +01:00
Faustin
1b5bbf72fc Limit partnership creation on public page by ip adress 2022-11-23 13:41:02 +01:00
Florian HENRY
d59391aaf2 NEW: Add Customer Order delivered (ORDER_CLOSE) in module Notification 2022-11-23 13:08:09 +01:00
Laurent Destailleur
5ba80117ec FIX #22858 #22862 2022-11-22 23:53:00 +01:00
Anthony Berton
cb20ac6567 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW---Shipping-address-to-invoice 2022-11-21 08:26:24 +01:00
Laurent Destailleur
1c43d40acf Debug v17 2022-11-20 14:37:31 +01:00
Laurent Destailleur
728bcf677e Debug v17 2022-11-19 13:36:52 +01:00
Anthony Berton
d25cc6e832 Clean 2022-11-18 16:28:21 +01:00
Anthony Berton
b272877fe2 Sponge and FIx and optimise 2022-11-18 16:20:52 +01:00
Anthony Berton
9d74ce7ed2 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW---Shipping-address-to-invoice 2022-11-18 10:41:53 +01:00
Laurent Destailleur
9fb7e3af5a Trans 2022-11-17 01:44:55 +01:00
Laurent Destailleur
aacb7b16a4 Fix installmodules.lock must also block module builder 2022-11-16 22:36:08 +01:00
Anthony Berton
72d20a963a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW---Shipping-address-to-invoice 2022-11-16 21:08:44 +01:00
Laurent Destailleur
dff93b30cd Debug v17 2022-11-14 22:18:39 +01:00
Laurent Destailleur
0df2f96921 Debug v17 2022-11-14 20:47:30 +01:00
Laurent Destailleur
bb53054232 Better message 2022-11-14 15:28:43 +01:00
Laurent Destailleur
2b9ebe9764
Merge pull request #22801 from Hystepik/develop#3 
New : expand/collapse user permission module
 2022-11-14 11:17:24 +01:00
Laurent Destailleur
856d2e7d45 Debug v17 2022-11-14 01:19:15 +01:00
Anthony Berton
7ba582ee66 Add shipping address 2022-11-13 23:18:44 +01:00
Laurent Destailleur
1fe588ea6f NEW Add the SMTP header References on ticket email created by email 2022-11-13 00:22:24 +01:00
Anthony Berton
c56ebf68db Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into pr/bb2a/21596 2022-11-12 19:28:04 +01:00
Laurent Destailleur
e6d9b02fe0 NEW Page for mass stock transfer can be used with no source stock 2022-11-12 02:16:50 +01:00
Laurent Destailleur
e466ba0d3a Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2022-11-12 00:39:21 +01:00
Anthony Berton
cb262b5305 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into pr/bb2a/21596 2022-11-10 09:07:17 +01:00
Alexandre SPANGARO
7c77c321c3 Merge remote-tracking branch 'upstream/develop' into 17p3 2022-11-10 02:23:38 +01:00
Laurent Destailleur
125af0867b
Merge pull request #22761 from aspangaro/17b12 
NEW Accountancy - Add a graphic option to enable lettering function - FPC21
 2022-11-09 18:51:06 +01:00
Laurent Destailleur
770c23c6a0
Merge pull request #22783 from aspangaro/17b16 
NEW VAT - Admin - Add information on deadline day for submission of VAT declaration
 2022-11-09 16:51:45 +01:00
Laurent Destailleur
b05342c1c9
Merge pull request #22785 from aspangaro/17b13 
NEW Invoice - Add french mention on pdf when vat debit option is on
 2022-11-09 16:48:11 +01:00
Laurent Destailleur
6d7456d2cd
Merge pull request #22789 from fboitel/NEW#735-massaction-user-project 
NEW#22735 Massaction to affect users on projects
 2022-11-09 16:44:18 +01:00
lmarcouiller
3aac23734f New : expand/collapse user permission module 2022-11-09 16:13:51 +01:00
Laurent Destailleur
148c285614 Add tooltip to explain feature to send ticket email 2022-11-09 13:10:13 +01:00
Laurent Destailleur
3fd4403bc7 Can show some tab entries as disabled (greyed link) 2022-11-08 22:34:13 +01:00
Faustin
725e75fbc9 massaction to affect users on projects 2022-11-08 14:59:22 +01:00
Alexandre SPANGARO
98cbd9663e Remove french translation for transifex 2022-11-08 04:30:37 +01:00
Alexandre SPANGARO
f2a518d8ea NEW Invoice - Add french mention on pdf when vat debit option is on 2022-11-08 04:29:48 +01:00
Alexandre SPANGARO
2112403d07 NEW VAT - Admin - Add information on deadline day for submission of VAT declaration 2022-11-08 03:21:47 +01:00
Laurent Destailleur
ddf60b399e Fix better separation label journal and label transfer 2022-11-07 21:48:52 +01:00
Laurent Destailleur
6fc8025244
Merge pull request #22771 from aspangaro/17b15 
FIX Accountancy - the pages of generations of entries are not journals, this term must be removed
 2022-11-07 19:40:34 +01:00
Laurent Destailleur
688e8fe768
Merge pull request #22760 from aspangaro/17b11 
NEW Accountancy - Added an option during export to export or not the lettering FPC21
 2022-11-07 18:49:01 +01:00
Laurent Destailleur
68a71b4c50
Merge pull request #22772 from aspangaro/17b16 
NEW Accountancy - Model Digitaria - Add a way to clean some words when you generate thirdparty accounting account FPC22
 2022-11-07 18:34:15 +01:00
Anthony Berton
e8f3c1d6b5 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into pr/bb2a/21596 2022-11-07 14:33:03 +01:00
Laurent Destailleur
506a9de384 Trans 2022-11-07 11:28:08 +01:00
Anthony Berton
31c7385dd7 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into pr/bb2a/21596 2022-11-07 11:24:24 +01:00
Laurent Destailleur
23916b37d3 CSS 2022-11-07 10:07:25 +01:00
Alexandre SPANGARO
a3e34f20e0 Merge remote-tracking branch 'upstream/develop' into 17b15 2022-11-06 17:07:38 +01:00
Alexandre SPANGARO
b63d9cfe68 Merge remote-tracking branch 'upstream/develop' into 17b16 2022-11-06 17:03:48 +01:00
Alexandre SPANGARO
b9423bb532 NEW Accountancy - Add a way to clean some words when you generate thirdparty accounting account 2022-11-06 17:02:01 +01:00
Alexandre SPANGARO
13c7ddddbf FIX Accountancy - the pages of generations of entries are not journals, this term must be removed 2022-11-06 16:51:12 +01:00
Laurent Destailleur
35c6433316 Prepare setnewpassword mode 2022-11-05 14:38:00 +01:00
Laurent Destailleur
e48af2bfbb Debug v17 2022-11-05 13:05:53 +01:00
Laurent Destailleur
b9fd2302b5 Trans 2022-11-05 12:39:42 +01:00
Alexandre SPANGARO
578b63fea6 NEW Accountancy - Add a graphic option to enable lettering function 2022-11-05 05:16:18 +01:00
Alexandre SPANGARO
df3580687c NEW Accountancy - Added an option during export to export or not the lettering 2022-11-05 04:38:12 +01:00
Laurent Destailleur
d0a824c5e9 Debug v17 2022-11-03 19:49:57 +01:00
Laurent Destailleur
946624fd67 Debug v17 2022-11-02 16:50:45 +01:00
Laurent Destailleur
59809eb50a Fix trans 2022-11-02 00:50:42 +01:00
Laurent Destailleur
1bc3b44e58
Merge pull request #22695 from FHenry/dev_new_allowdownloadlink_option_in_conf_module 
NEW: Allow download link option in module configuration (propal,invoice,supplier proposal, order)
 2022-11-02 00:43:23 +01:00
Laurent Destailleur
cb15e1ea8a
Merge pull request #22705 from fboitel/NEW#22622-thirdparty-partnership 
NEW #22622: all partneships displayed on tab partnership of thirdparties and members
 2022-11-01 21:11:06 +01:00
Laurent Destailleur
30375fc769
Merge pull request #22710 from fboitel/NEW#22676-massaction-product-list 
NEW #22676 : massaction for updating product prices
 2022-11-01 21:05:21 +01:00
Laurent Destailleur
9aeb1b0f86 Remove no more used option MODULEBUILDER_FOREVERYONE 
Add menu entry in main menu Tools for Modulebuilder and API explorer
 2022-11-01 11:46:21 +01:00
Faustin
71e55ab709 Translation update 2022-10-30 02:37:56 +01:00
Faustin
d15493e50d massacrtion for updating product prices 2022-10-30 02:59:11 +02:00
Anthony Berton
0880893319 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into pr/bb2a/21596 2022-10-29 21:01:28 +02:00
Laurent Destailleur
41a07f5e7d Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-10-29 12:51:51 +02:00
Laurent Destailleur
8a599ec610 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-10-29 12:47:36 +02:00
Laurent Destailleur
c67f94ca4b Merge 2022-10-29 12:46:22 +02:00
Faustin
bc4b9c4b18 NEW #22622: all partneships displayed on tab partnership of thirdparty and member 2022-10-29 09:39:12 +02:00
Florian HENRY
185d573205 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_allowdownloadlink_option_in_conf_module 2022-10-28 10:40:59 +02:00
Florian HENRY
b3c7d64cb2 NEW: Allow download link in module configuration (propal,invoice,supplier proposal, order) 2022-10-28 10:40:43 +02:00
Anthony Berton
cacb642bc0 NEW - Compléte function pdfBuildThirdpartyName to use company name of contact 2022-10-27 22:45:32 +02:00
Laurent Destailleur
035c08536c Standardization of the name of some constant (customer match supplier) 2022-10-27 03:32:03 +02:00
Anthony Berton
7b3ab23dca Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into pr/bb2a/21596 2022-10-26 14:11:54 +02:00
Laurent Destailleur
013d242943 Merge FCKEDITOR_ENABLE_DETAILS and FCKEDITOR_ENABLE_PRODUCTDESC. 
The 2 options has similar effect, only one in code is required.
 2022-10-25 17:16:14 +02:00
Laurent Destailleur
68e1509834 Fix ckeditor 2022-10-24 22:38:45 +02:00
Anthony Berton
16c2e8cbc9 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into pr/bb2a/21596 2022-10-24 20:06:29 +02:00
Laurent Destailleur
91aaf8ef4e
Merge branch 'develop' into FIX---Max-size-send-backup 2022-10-24 19:16:16 +02:00
Anthony Berton
64bc7a93c3 ADD - Option Products to buy only 2022-10-24 18:43:23 +02:00
Anthony Berton
7d911aad20 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into pr/bb2a/21596 2022-10-24 18:11:01 +02:00
Laurent Destailleur
c22e97d7f3
Merge pull request #22645 from JavierNR/feature/intervention_signature 
NEW: Enable online signature for interventions
 2022-10-24 17:58:49 +02:00
Laurent Destailleur
26d1182838 FIX Debug ticket module (no double event when sending private message) 
FIX The backtopage after sending ticket message was ko.
 2022-10-23 22:32:52 +02:00
Laurent Destailleur
0f8d87da3b Clean code 2022-10-23 21:25:52 +02:00
Yoan Mollard
7ff84f4e42 Add help picto to remind users to respect SPF/DKIM in FROM e-mails 2022-10-23 03:25:55 +02:00
Laurent Destailleur
330a1199e4 Look and feel v17 2022-10-21 15:08:54 +02:00
Laurent Destailleur
fc64bcf56f Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-10-21 13:22:27 +02:00
Laurent Destailleur
3e5273d83b NEW Option PRODUIT_DESC_IN_FORM accept (desktop only or +smartphone) 2022-10-21 11:14:28 +02:00
Anthony Berton
8b61fd5c1a Lang 2022-10-21 00:31:31 +02:00
Laurent Destailleur
a52de14003 Debug hrm module 2022-10-20 22:56:07 +02:00
Laurent Destailleur
84d47e9b0c Fix max nb of attendees reached 2022-10-20 19:26:24 +02:00
Laurent Destailleur
2d378ecede CSS 2022-10-20 19:16:25 +02:00
Javier Núñez
8173841ff9 Translations 2022-10-20 18:19:17 +02:00
Laurent Destailleur
d2ec128595 Fix field fk_user_create of event registration must be null 2022-10-20 18:14:00 +02:00
Laurent Destailleur
fea4cf4305 trans 2022-10-20 16:05:37 +02:00
Laurent Destailleur
510125ceb0 Fix sanitize data 2022-10-20 15:47:44 +02:00
Laurent Destailleur
2aea86dc8c FIX #yogosha12673 2022-10-20 13:58:59 +02:00
Laurent Destailleur
2eb3b62c83 Fix trans 2022-10-19 17:21:42 +02:00
Laurent Destailleur
06d94c9a97 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-10-19 17:11:32 +02:00
Laurent Destailleur
0d17026276 FIX Import contact when duplicate thirdparties 
FIX Import of socialnetwork field
 2022-10-19 16:19:22 +02:00
jpb
87339de68d add human readeable trad 2022-10-19 09:29:11 +02:00
Laurent Destailleur
938bc27917 Update sample for fail2ban 2022-10-18 12:59:15 +02:00
Laurent Destailleur
ebd7605545 Fix bad recalculation of cost price of production of a product 2022-10-17 17:45:57 +02:00
Laurent Destailleur
c63d310f2f Clean code 2022-10-17 15:26:42 +02:00
Laurent Destailleur
68f16b13d7 Fix typo 2022-10-17 02:52:03 +02:00
Laurent Destailleur
60cf6437e0 Disabling warning (for PHPmail usage) is now easier. 2022-10-17 01:23:56 +02:00
Laurent Destailleur
71b7ef1924
Merge pull request #22525 from FHenry/dev_new_rank_contract_line_20512 
NEW: Manage Position (Rank) on Contract Lines
 2022-10-13 10:00:15 +02:00
Laurent Destailleur
4424d1cac1
Merge pull request #22562 from erikvanberkum/develop 
Fix missing translation BOMNetNeeds
 2022-10-13 09:47:22 +02:00
Laurent Destailleur
eabf01a422 Debug sepa payment 2022-10-13 05:31:36 +02:00
Laurent Destailleur
9b1a01bbd6 Clean code 2022-10-13 04:49:45 +02:00
Laurent Destailleur
96bf7016c7 Fix filter on membership status and graph 2022-10-13 04:25:20 +02:00
Erik van Berkum
ddba58b204 fix missing translation BOMNetNeeds 2022-10-13 10:08:03 +09:00
Laurent Destailleur
71e7d21187 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-10-13 01:10:56 +02:00
Laurent Destailleur
eb0f898b01 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-10-13 01:10:31 +02:00
Laurent Destailleur
bd617965a7
Merge pull request #22556 from fboitel/NEW#22546-massaction-supervisor 
NEW #22546 : can now set user supervisors using mass action in htdocs…
 2022-10-13 00:31:30 +02:00
Laurent Destailleur
95b69eaefb Clean code 2022-10-12 19:57:25 +02:00
Laurent Destailleur
f718de344b Fix typo 2022-10-12 19:40:21 +02:00
Faustin
168ea58a07 NEW #22546 : can now set user supervisors using mass action in htdocs/user 2022-10-12 18:59:05 +02:00
Laurent Destailleur
9ce11683de Transifex sync 2022-10-12 16:38:10 +02:00
Laurent Destailleur
3a1b4bf9d2 Better translation for english countries for journals. 2022-10-12 13:24:34 +02:00
Laurent Destailleur
9d0453028d Fix remove trans 2022-10-12 12:39:45 +02:00
Laurent Destailleur
7ebda11ad0 Fix search in TakePOS 2022-10-11 22:08:26 +02:00
Laurent Destailleur
b61bee1f8d Fix setup of status 2022-10-11 13:20:28 +02:00
jpb
c5c0628ee8 add short cicility 2022-10-11 10:05:56 +02:00
Florian HENRY
eb533294d1 review 2022-10-11 08:59:15 +02:00
Laurent Destailleur
96117ec52b Fix no need to enter creation date when creation job application 2022-10-10 10:04:04 +02:00
Laurent Destailleur
69c5f5df20 Add language de_LU 2022-10-10 04:23:25 +02:00
Laurent Destailleur
fca09f7a1a Debug v17 2022-10-10 01:08:22 +02:00
Laurent Destailleur
2053ad8f49 NEW Can switch status of website and page from the website toolbar 2022-10-09 20:52:50 +02:00
Laurent Destailleur
fa651f7566 Enhance website CMS toolbar 2022-10-09 17:49:44 +02:00
Florian HENRY
e2e4e63bd1 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_rank_contract_line_20512 2022-10-09 14:12:39 +02:00
Laurent Destailleur
5fc1ce5491 Translation 2022-10-08 17:09:31 +02:00
Laurent Destailleur
49e68c7fce NEW Bulk action to remove a category in list/search website pages 2022-10-08 17:04:20 +02:00
Laurent Destailleur
6729ddbbb6 NEW Templates of websites are now directories and not zip into core repo 2022-10-08 13:48:25 +02:00
Laurent Destailleur
8d2a708de1
Merge pull request #22278 from aspangaro/16p10-reconcilev2 
FIX Accountancy - Review reconcile function (separate manuel & auto reconcile)
 2022-10-08 02:08:50 +02:00
Laurent Destailleur
fbeb123790
Merge pull request #22519 from dolibit-ut/patch-619 
Update trips.lang
 2022-10-07 23:31:45 +02:00
Laurent Destailleur
51f5bd6723
Merge pull request #22520 from dolibit-ut/patch-620 
Update expensereports.lang
 2022-10-07 23:31:37 +02:00
Florian HENRY
d597eb8202 NEW: Manage Position (Rank) on Contract Lines 2022-10-07 14:43:58 +02:00
UT from dolibit
b3cf0ac539
Update blockedlog.lang 
separate logTypes
 2022-10-07 10:19:31 +02:00
UT from dolibit
fdc81bb35d
Update expensereports.lang 2022-10-07 10:10:16 +02:00
UT from dolibit
aeaa1dd832
Update trips.lang 
sort by alphabetical order before copy to expensereports.lang
 2022-10-07 10:04:10 +02:00
Alexandre SPANGARO
b47f5cd19d Merge remote-tracking branch 'upstream/develop' into 16p10-reconcilev2 2022-10-06 17:30:38 +02:00
Laurent Destailleur
be10cdee95 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-10-06 16:03:50 +02:00
Laurent Destailleur
8fdf4876d9 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-10-06 15:39:10 +02:00
Laurent Destailleur
0e8139b801 Clean code 2022-10-05 21:05:29 +02:00
Laurent Destailleur
509c85672e FIX Protection against bad value into accurancy setup 2022-10-05 10:45:29 +02:00
Laurent Destailleur
b53b0e4f9b
Merge pull request #22429 from fboitel/NEW#22328 
NEW #22328
 2022-10-04 17:49:02 +02:00
Laurent Destailleur
1b8442962e
Merge pull request #22458 from fboitel/NEW#22424 
NEW #22424
 2022-10-04 17:43:27 +02:00
Laurent Destailleur
a35d58fc01
Merge pull request #22470 from mikygee/develop 
Correction bug #22469 Especes is only written with plurial
 2022-10-04 17:15:34 +02:00
Laurent Destailleur
bb624dd0a1 NEW Can send an email on scheduled job error 2022-10-03 19:32:57 +02:00
lvessiller
f43056a76f Merge branch 'develop' of github.com:Dolibarr/dolibarr into new-event-list-with-color 2022-10-03 14:33:32 +02:00
mikygee
eb6752de88 Correction bug #22469 Especes is only written with plurial 2022-10-02 01:24:34 +02:00
Laurent Destailleur
51c299ffbb NEW Add hidden option MAIN_EMAIL_SUPPORT_ACK 2022-10-01 13:26:11 +02:00
Alexandre SPANGARO
7b8ed8dfc5 Merge remote-tracking branch 'upstream/develop' into 16p10-reconcilev2 2022-10-01 08:06:52 +02:00
Laurent Destailleur
625df49850 Clean and standardize code 2022-09-30 12:31:29 +02:00
Faustin
800dab111b Precision 'signed' for download link after document is signed 2022-09-29 14:54:44 +02:00
Faustin
30c3543d20 Online pdf contract signature 2022-09-29 14:28:58 +02:00
Laurent Destailleur
28b3cfe37f Trans 2022-09-29 10:27:51 +02:00
ksar
9a96aad737
FIX #22440 2022-09-28 23:39:23 +02:00
Laurent Destailleur
f62f1784b2 Trans 2022-09-28 21:35:42 +02:00
Laurent Destailleur
fb28d14097 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-09-28 21:20:37 +02:00
Laurent Destailleur
21f608d0fd
Merge pull request #22421 from dolibit-ut/patch-614 
Update trips.lang
 2022-09-28 20:40:22 +02:00
Laurent Destailleur
0e656e9b0b
Merge pull request #22422 from dolibit-ut/patch-615 
Update HOWTO-Translation.txt
 2022-09-28 20:39:49 +02:00
Laurent Destailleur
8048322b65
Merge pull request #22435 from hregis/fix_csrf_and_lost_parameter_value 
FIX CSRF + lost value of constant after use save button
 2022-09-28 20:08:04 +02:00
Laurent Destailleur
3e9e17c746 Debug tooltip of import tool 2022-09-28 16:55:51 +02:00
lmarcouiller
b753968c18 Fix : import module sim message + warnings 2022-09-28 12:27:20 +02:00
Regis Houssin
aafecb6d2b FIX missing the management of a constant in the Ticket config 2022-09-27 17:08:08 +02:00
Laurent Destailleur
52b12ee47d Trans 2022-09-27 14:12:37 +02:00
Laurent Destailleur
2b44bb6d97 trans 2022-09-27 13:44:57 +02:00
Laurent Destailleur
fe6dcb2269 NEW ModuleBuilder can generate code of class from an existing SQL table 2022-09-27 13:37:38 +02:00
Faustin
1ba48092ae Messages added 2022-09-27 11:09:09 +02:00
UT from dolibit
b5a9ad7cf7
Update HOWTO-Translation.txt 2022-09-26 21:56:13 +02:00
UT from dolibit
a3b098364e
Update trips.lang 
we have trip.lang & new expensereports.lang 
should we merge and make a migration to expensereports.lang (or shorter expense/expreport) or stay at trip.lang ?
 2022-09-26 21:49:16 +02:00
Laurent Destailleur
eee05613bb
Merge pull request #21667 from Hystepik/develop#3 
Fix : Spam db public page yogosha report 11813
 2022-09-25 18:07:55 +02:00
Alexandre SPANGARO
d009cbdcf7 Merge remote-tracking branch 'upstream/develop' into 17p1 2022-09-25 05:32:02 +02:00
Laurent Destailleur
5139a1afab
Merge pull request #22331 from atm-lena/develop_FIX_BOMServices_CostCalculWorkstation_ErrorTrad 
Error Trad
 2022-09-24 13:24:45 +02:00
Laurent Destailleur
0dc6701d17
Merge pull request #22344 from Hystepik/develop#2 
Close #22245 : new increase holiday massaction
 2022-09-23 18:47:40 +02:00
Laurent Destailleur
8021c635cb
Merge pull request #22350 from frederic34/extrafieldpricewithcurrency 
NEW extrafield price with currency
 2022-09-23 17:44:09 +02:00
lmarcouiller
9b7d0d0517 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#2 2022-09-23 10:40:39 +02:00
Laurent Destailleur
3e246f4399 NEW Add option "Show price on the generated documents for receptions" 2022-09-23 09:21:07 +02:00
Laurent Destailleur
de210e62ff Clean lang 2022-09-22 18:45:29 +02:00
Laurent Destailleur
b2a6c7347f Trans 2022-09-22 13:17:15 +02:00
Laurent Destailleur
d314ed380b NEW Can edit property css, cssview, csslist on extrafields 2022-09-22 13:01:11 +02:00
atm-lena
8258706b58 US trasnlation 2022-09-22 10:24:47 +02:00
Frédéric FRANCE
3d0baa79cd Merge remote-tracking branch 'upstream/develop' into extrafieldpricewithcurrency 2022-09-21 20:07:02 +02:00
Frédéric FRANCE
9ddf65de63 NEW extrafield price with currency 2022-09-21 14:59:46 +02:00
Laurent Destailleur
c524a3ddc7 Trans 2022-09-21 14:08:23 +02:00
Laurent Destailleur
45c4a6ce1c Fix regression using confirm as POST (pb with cursor and download file) 2022-09-21 11:11:56 +02:00
lmarcouiller
9d1a4ede6e Close #22245 : new increase holiday massaction 2022-09-21 11:06:54 +02:00
Laurent Destailleur
36e1bfb297 NEW Option PRODUCTBATCH_SHOW_WAREHOUSE_ON_SHIPMENT showing wh on PDF 2022-09-21 00:50:04 +02:00
Laurent Destailleur
eab8af760d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-20 10:17:53 +02:00
atm-lena
69fc6172f9 Error Trad 2022-09-20 10:04:21 +02:00
Laurent Destailleur
d19bb01f03
Merge pull request #22303 from atm-lena/develop_FIX_BOMServices_CostCalculWorkstation 
Bom services : fix calcul of cost for line without workstation
 2022-09-20 00:08:52 +02:00
Laurent Destailleur
b1136f6115 NEW Save one click to select on delivery ack, on emails. 2022-09-19 21:10:07 +02:00
Laurent Destailleur
fa58d35fa1 Clean code 2022-09-19 19:46:14 +02:00
Faustin
0fed5dbb3d NEW: possibility to select scopes with checkbox for oauth tokens 2022-09-18 02:21:46 +02:00
Laurent Destailleur
ad2625f842 Fix duplicate string 2022-09-17 12:45:42 +02:00
Laurent Destailleur
7f33d66d5c Fix test filter rule 2022-09-16 17:00:00 +02:00
Laurent Destailleur
111e5ba3f0 NEW Add a button "Test collect" in email collector 2022-09-16 14:50:25 +02:00
atm-lena
5843cc8cb6 Bom services : fix calcul of cost for line without workstation 2022-09-16 11:11:20 +02:00
Alexandre SPANGARO
373449900f FIX Accountancy - Review reconcile function (separate manuel & auto reconcile) 2022-09-15 05:21:22 +02:00
Laurent Destailleur
91bdaae898 Look and feel v17 2022-09-15 03:08:33 +02:00
Laurent Destailleur
827231f487
Merge branch 'develop' into develop#3 2022-09-13 02:10:46 +02:00
Laurent Destailleur
0a4514c785
Merge pull request #21911 from ymollard/members-public-counters 
NEW: Public counters feature
 2022-09-13 01:46:49 +02:00
Laurent Destailleur
7dbde6f934
Merge branch 'develop' into develop_NEW_Service_DefaultWorkstation 2022-09-13 01:38:49 +02:00
Laurent Destailleur
f103382935 Debug webhook 2022-09-13 00:16:38 +02:00
Laurent Destailleur
209bf00b69 Trans 2022-09-13 00:12:57 +02:00
Hystepik
dd5a4fd7eb
Merge branch 'develop' into develop#3 2022-09-12 15:08:10 +02:00
Laurent Destailleur
8771dc197b Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-12 10:32:50 +02:00
Laurent Destailleur
2293d82607 NEW Add picto property on sub-module for paswword generation 2022-09-11 12:18:43 +02:00
Laurent Destailleur
7a97fc8989 Fix missing trans 2022-09-10 16:44:32 +02:00
Laurent Destailleur
38676b6c04 Fix phpunit 2022-09-10 00:54:16 +02:00
Laurent Destailleur
584f9e6a73 Clean code to manage SEPA payment using external service 2022-09-09 04:43:15 +02:00
Laurent Destailleur
9a09e0f304 Merge SEPA payment using Stripe manually. 2022-09-09 02:26:45 +02:00
Laurent Destailleur
da0cf1cbf2 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-08 23:00:10 +02:00
Laurent Destailleur
764e6158eb Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-09-08 22:57:50 +02:00
Laurent Destailleur
90d58bde27 Clean module datapolicy 2022-09-08 16:19:59 +02:00
Laurent Destailleur
c3f673c3ad Clean permissions for barcode menu 2022-09-08 14:58:00 +02:00
Laurent Destailleur
6b3095ae9a Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-08 14:10:28 +02:00
Laurent Destailleur
fc91d8fc4e Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-09-08 14:02:56 +02:00
Laurent Destailleur
044d2baca1 Sync transifex 2022-09-08 14:02:21 +02:00
atm-lena
81ed97e9fc Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_NEW_Service_DefaultWorkstation 2022-09-08 11:21:05 +02:00
Laurent Destailleur
bed495fc62 Trans 2022-09-07 16:05:00 +02:00
Laurent Destailleur
50169bc96a Clean code 2022-09-07 15:50:40 +02:00
Hystepik
ca78b4bc50
Merge branch 'develop' into develop#3 2022-09-07 14:39:00 +02:00
lmarcouiller
f08e8ba2b3 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#2 2022-09-07 10:50:55 +02:00
Laurent Destailleur
c06963f2ff Trans 2022-09-06 14:22:55 +02:00
lmarcouiller
c6349ce51a Fix : Yogosha report 12245 bad field verification 2022-09-06 11:06:48 +02:00
Laurent Destailleur
33ad0de37e NEW Show also shceduled task never finished in scheduled task widget 2022-09-05 12:27:06 +02:00
Laurent Destailleur
81865ec55b NEW Support IP type in extrafields 2022-09-05 09:39:54 +02:00
Laurent Destailleur
6406fbdc7e NEW Add a way to enter LICENSE file content in property of website 2022-09-03 19:02:42 +02:00
Laurent Destailleur
0d9e595f0e Fix profile to export categories 2022-09-02 19:43:48 +02:00
Laurent Destailleur
84633177da Trans 2022-09-02 14:44:55 +02:00
Laurent Destailleur
317b351aee Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-02 11:53:25 +02:00
Laurent Destailleur
19c3763a55
Merge branch 'develop' into userbankaccount 2022-09-02 11:53:02 +02:00
Laurent Destailleur
d17f0c57e2 NEW Link "add to bookmark" always on top in the bookmark popup 2022-09-02 11:27:16 +02:00
Gauthier PC portable 024
e1bf5a5e6b FIX : Recursively retrieves all parent bom in the tree that leads to the $bom_id bom to check if we're allowed to add bom as bomline 2022-09-01 17:16:59 +02:00
Frédéric FRANCE
4ac4f78a99 add extrafield setup 2022-09-01 15:25:19 +02:00
Laurent Destailleur
065c96e1be Trans 2022-09-01 13:57:15 +02:00
Laurent Destailleur
6903b96f6b Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-01 12:39:25 +02:00
Laurent Destailleur
6c45b13178 NEW Add filter "Product subject to lot/Serial" in stock per lot/serial 2022-09-01 12:32:27 +02:00
Laurent Destailleur
8bf8beb898 Debug module ticket 2022-09-01 10:54:20 +02:00
bagtaib
825fee4f79 update company fields if already exists 2022-08-30 00:36:29 +01:00
Frédéric FRANCE
8ab6d293e1 Merge remote-tracking branch 'upstream/develop' into userbankaccount 2022-08-29 17:00:09 +02:00
Frédéric FRANCE
ec764595f8 enhance bank display for user 2022-08-29 16:59:23 +02:00
Hystepik
0214c0993d
Merge branch 'develop' into develop#3 2022-08-29 10:25:29 +02:00
Yoan Mollard
c581024c8c NEW: Public counters feature 2022-08-26 21:16:43 +02:00
Laurent Destailleur
6f9f7fa233
Merge pull request #21796 from cfoellmann/PR/recruitment-renaming 
Recruitment improvements
 2022-08-26 19:18:26 +02:00
Laurent Destailleur
1f2c367ec3
Merge pull request #21840 from fcharlaix-opendsi/21780 
Work for #21780 Add cleanUnfinishedCronjob job
 2022-08-26 18:41:41 +02:00
Laurent Destailleur
5f3dbfd60a css 2022-08-25 19:33:04 +02:00
Laurent Destailleur
2e905b127a Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/accountancy/index.php
	htdocs/product/admin/product.php
 2022-08-25 14:35:08 +02:00
Anthony Berton
6f8de50004 Add right 2022-08-24 19:59:06 +02:00
Laurent Destailleur
03d086f741 NEW Encrypt all sensitive constants in llx_const 2022-08-24 12:22:11 +02:00
atm-lena
6e5d395ac8 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_NEW_Service_DefaultWorkstation 2022-08-24 11:38:19 +02:00
Laurent Destailleur
5071c3d626 Clean option MAIN_IMAP_USE_PHPIMAP 2022-08-23 22:59:03 +02:00
Laurent Destailleur
e73f44e2aa Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-23 22:42:35 +02:00
Laurent Destailleur
b15a4e504e Merge IMAP with phpimap 2022-08-23 22:34:24 +02:00
Anthony Berton
6d625d6128 Add options for clean list 2022-08-23 20:09:40 +02:00
Laurent Destailleur
83ace0cb12
Merge pull request #21655 from rycks/14.0-add_account_number_on_invoices_for_debit 
NEW #21654: add bank account number used on invoices for debit
 2022-08-23 15:46:59 +02:00
Laurent Destailleur
06be8dc4bf Trans 2022-08-23 13:39:06 +02:00
Laurent Destailleur
48c94afd4c Trans 2022-08-23 12:46:54 +02:00
Laurent Destailleur
da01c7ea49 Trans 2022-08-23 12:05:23 +02:00
Anthony Berton
b3c903723f Add menu and clean 2022-08-23 11:37:08 +02:00
Laurent Destailleur
9f3ed07e87 Trans 2022-08-23 11:00:28 +02:00
Anthony Berton
be2ecf1c3a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into pr/bb2a/21596 2022-08-23 10:52:21 +02:00
Laurent Destailleur
79f9d793e1
Merge branch 'develop' into add_option_pdf_global_sales_rep 2022-08-23 01:58:07 +02:00
Laurent Destailleur
45683d43d3
Merge pull request #21821 from aspangaro/17p2 
NEW Accountancy - Manage supplier deposit with specific account
 2022-08-22 23:50:44 +02:00
Laurent Destailleur
6c2a08a457 Fix translation of label of cron job. 2022-08-22 20:24:17 +02:00
Florian Charlaix
c0d36979ee Work for #21780 Add cleanUnfinishedCronjob job 
Add cleanUnfinishedCronjob cronjob to clean unfinished job
Set job processing to 0, last result as an error with the reason in last output
 2022-08-22 17:34:47 +02:00
Alexandre SPANGARO
bb786d5ab9 NEW Accountancy - Manage supplier deposit with specific account 2022-08-21 08:06:04 +02:00
Christian Foellmann
83cb1086c1 fix UI strings 2022-08-18 17:21:28 +02:00
Faustin
1ae8a14d24 translation 2022-08-16 17:45:33 +02:00
Laurent Destailleur
6cf47d0ed1 Fix trans 2022-08-15 02:35:17 +02:00
Laurent Destailleur
826b9a6d62 Fix trans 2022-08-15 02:27:07 +02:00
Laurent Destailleur
5b74f1d3dc Fix duplicate string 
Conflicts:
	htdocs/public/members/new.php
 2022-08-13 12:35:07 +02:00
Laurent Destailleur
d510e3ffcc Fix duplicate string 2022-08-13 12:33:00 +02:00
Laurent Destailleur
533e4f2424 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/fr_FR/accountancy.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/cashdesk.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/fr_FR/members.lang
	htdocs/langs/fr_FR/products.lang
 2022-08-12 16:03:09 +02:00
Laurent Destailleur
5fa110ce74 Fix trans 2022-08-12 15:58:29 +02:00
Laurent Destailleur
0d68c0ba14 Debug v16 2022-08-12 15:07:15 +02:00
lvessiller
74a2b58e85 FIX resolve conflicts 2022-08-12 14:55:06 +02:00
Laurent Destailleur
79a5a2b3ab Transifex sync 2022-08-12 14:02:18 +02:00
Laurent Destailleur
bdd9c16401 Fix trans 2022-08-12 12:17:21 +02:00
Laurent Destailleur
c3d5d99044 Fix lang 2022-08-11 23:28:13 +02:00
atm-lena
2fbba30e2a Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_NEW_Service_DefaultWorkstation 2022-08-11 12:11:41 +02:00
Laurent Destailleur
abfaefbe41
Merge pull request #21700 from frederic34/outh2forswiftmailer 
add oauth2 for swiftmailer
 2022-08-11 01:27:53 +02:00
Frédéric FRANCE
bf704ec360
remove duplicate 2022-08-10 13:41:30 +02:00
Frédéric FRANCE
b1814a45ce add oauth2 for swiftmailer 2022-08-10 09:33:58 +02:00
Laurent Destailleur
3f62cd27eb
Merge pull request #21632 from fboitel/NEW-smtp-by-oauth2 
NEW smtp by oauth2
 2022-08-10 05:26:31 +02:00
Laurent Destailleur
f50f8e682d
Merge branch 'develop' into 14.0-add_account_number_on_invoices_for_debit 2022-08-10 05:20:12 +02:00
lvessiller
a3b240bd3b FIX resolve conflicts 2022-08-05 11:23:02 +02:00
Anthony Berton
9955e51956 NEW - FTP Function mkdir 2022-08-05 09:39:31 +02:00
lmarcouiller
bcd5aacb4c Fix : Spam db public page 2022-08-04 16:53:58 +02:00
Laurent Destailleur
0a623ab068 Fix yogosha#11976 2022-08-04 16:19:41 +02:00
Laurent Destailleur
f56abb1e5f Fix limit on nb of stickers 2022-08-04 16:17:07 +02:00
Laurent Destailleur
4a9c9a97e5 WIP Implement a generic handler for OAuth. 2022-08-04 15:58:00 +02:00
Laurent Destailleur
1093084e9b Better doc 2022-08-04 14:00:04 +02:00
Eric Seigne
6e6982d365 new #21654: add bank account number used on invoices for debit 2022-08-04 09:49:44 +02:00
Faustin
29bb03a25b Conflict 2022-08-03 20:07:16 +02:00
Faustin
868d07ae96 New prop : select auth type with radio box 2022-08-03 20:01:13 +02:00
Laurent Destailleur
514b216864
Merge pull request #21588 from altairisfr/termname 
NEW : TAKEPOS - setup terminal name
 2022-08-03 18:34:16 +02:00
Laurent Destailleur
b63197fe4a
Merge pull request #21646 from Hystepik/develop#2 
New : Add DoS security on GETPOST with img Yogosha report 11963
 2022-08-03 17:54:13 +02:00
Laurent Destailleur
c545756b6e
Revert "FIX : VAT rate recalculation" 2022-08-03 17:06:19 +02:00
Laurent Destailleur
0c23ed1e80
Merge pull request #21648 from bb2a/NEW---add-function-ftp-put 
NEW - Add function ftp put
 2022-08-03 16:53:48 +02:00
Anthony Berton
985d9b3624 Function 2022-08-03 15:59:53 +02:00
lmarcouiller
c7652af3bc New : Add DoS security on GETPOST with img 2022-08-03 14:24:27 +02:00
Laurent Destailleur
e17c00b4d8 Debug v16 2022-08-02 22:40:21 +02:00
Laurent Destailleur
3fc0478293 Debug v16 2022-08-02 22:39:18 +02:00
Laurent Destailleur
528d54ba79 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-02 20:28:07 +02:00
Laurent Destailleur
a57c96f6d9
Merge branch 'develop' into dev_add_IMAPport_email_collector 2022-08-02 19:12:44 +02:00
Philippe GRAND
a42e0a8892 add translation 2022-08-02 11:57:53 +02:00
jpb
cec9725ced FIX : VAT rate recalculation 
set a checkbox on clone formquestion
 2022-08-01 16:28:44 +02:00
Faustin
a990480ba6 Use of oauth for smtp is available (tested only with google) 2022-08-01 11:31:32 +02:00
Florian HENRY
454fb6b0f5 new: Add IMAP port setting on email collector module 2022-07-31 13:10:38 +02:00
Laurent Destailleur
fe2a0e0340 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/langs/el_GR/errors.lang
	htdocs/langs/hr_HR/errors.lang
	htdocs/langs/hu_HU/errors.lang
	htdocs/langs/nb_NO/errors.lang
	htdocs/langs/uk_UA/errors.lang
 2022-07-29 18:12:38 +02:00
Laurent Destailleur
629689b13f Fix bad trans %n instead of %s 2022-07-29 18:06:49 +02:00
Laurent Destailleur
77389b3855 Fix trans 2022-07-29 17:35:39 +02:00
Laurent Destailleur
ab2afd772b
Merge pull request #21600 from ymollard/eventorg-fixes 
FIX: EventOrganization Missing databases entries and labels
 2022-07-29 15:40:21 +02:00
Laurent Destailleur
9796ec22bf
Merge pull request #21615 from bb2a/NEW---FTP-lib-and-lang-file 
NEW - FTP lib
 2022-07-29 15:05:52 +02:00
Laurent Destailleur
f0c8523713 Debug v16 2022-07-29 14:57:11 +02:00
Laurent Destailleur
7404e8fb75 Debug v16 2022-07-29 14:50:21 +02:00
atm-lena
462352b957 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_NEW_Service_DefaultWorkstation 2022-07-29 12:06:43 +02:00
Anthony Berton
8e7fa102b8 Clean 2022-07-29 11:14:28 +02:00
Anthony Berton
f10dd33440 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW---FTP-lib 2022-07-29 09:40:18 +02:00
Anthony Berton
77b3e511be Del file lang 2022-07-29 08:51:57 +02:00
Laurent Destailleur
b6a6dd91d8 # WARNING: head commit changed in the meantime 
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
 2022-07-28 18:52:44 +02:00
Anthony Berton
ce87eea3ec ErrorFTPNodisconnect 2022-07-28 18:18:04 +02:00
Laurent Destailleur
0800dc1d8a
Merge pull request #21602 from bb2a/NEW---Add-user-right-order-generete-doc 
NEW - Add user right order generete doc
 2022-07-28 14:03:43 +02:00
Anthony Berton
d8ae2361a9 NEW - Add user right order generete doc 2022-07-28 11:29:36 +02:00
Laurent Destailleur
1a61209c0d Fix fatal error in Stripe setup page 
Conflicts:
	htdocs/stripe/admin/stripe.php
 2022-07-28 10:55:38 +02:00
Laurent Destailleur
2020a58ebd Fix fatal error in Stripe setup page 2022-07-28 10:47:36 +02:00
Laurent Destailleur
37c725fc6c NEW Can delete a website even if not empty 2022-07-27 23:01:33 +02:00
Yoan Mollard
e9528443b2 Insert speaker contact type into db 2022-07-27 22:12:36 +02:00
Yoan Mollard
5600fd63df Retrieve category and insert default const at init of eventorganization module 2022-07-27 21:36:57 +02:00
Laurent Destailleur
c5e5f2915e Look and feel v17 2022-07-27 19:01:26 +02:00
Anthony Berton
c2715d1469 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEX---List-product-in-orders 2022-07-27 15:35:58 +02:00
BB2A Anthony Berton
da7f267df3 [200~Merge branch NEX---List-product-in-orders of https://github.com/bb2a/dolibarr into NEX---List-product-in- 2022-07-27 15:02:37 +02:00
BB2A Anthony Berton
7a8006c0a0 init 2022-07-27 14:40:45 +02:00
Christophe Battarel
daa106113d fix translation string 2022-07-27 11:11:26 +02:00
Christophe Battarel
fd6838776f NEW : TAKEPOS - setup terminal name 2022-07-27 11:09:02 +02:00
Laurent Destailleur
78ee02408e
Merge pull request #21431 from fboitel/NEW-recursive-envents 
NEW : Recurrent events on agenda v1
 2022-07-27 11:01:26 +02:00
Laurent Destailleur
a04bef1909 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-27 02:48:56 +02:00
Laurent Destailleur
f4b7b0d060 Trans 2022-07-27 02:41:55 +02:00
Laurent Destailleur
8439ed24b1 Trans 2022-07-27 01:58:29 +02:00
lvessiller
bae3583fe3 FIX resolve conflicts 2022-07-26 16:49:35 +02:00
Laurent Destailleur
3f04a91b07 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-26 14:16:44 +02:00
Laurent Destailleur
138e93402d Fix language font for PDF 2022-07-26 14:15:38 +02:00
Laurent Destailleur
5903a9f87f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-07-26 12:24:24 +02:00
Laurent Destailleur
64fd91c319 Trans 2022-07-26 11:58:47 +02:00
Laurent Destailleur
d0e74fbbeb Sync transifex 2022-07-26 10:54:03 +02:00
Laurent Destailleur
4d58058697 Fix separator 2022-07-26 10:01:08 +02:00
Yoan Mollard
ae70dc11c6 Fixed labels 2022-07-25 22:28:07 +02:00
Laurent Destailleur
122c27885f Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-25 10:29:11 +02:00
Laurent Destailleur
3262426b84 Trans 2022-07-25 08:59:01 +02:00
Laurent Destailleur
8fb7d129c9 Trans 2022-07-25 00:36:38 +02:00
Laurent Destailleur
ab81492fa4 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formwebsite.class.php
	htdocs/core/lib/cron.lib.php
 2022-07-24 22:17:25 +02:00
Laurent Destailleur
da8a9e6082
Merge pull request #20625 from Easya-Solutions/new-inventory-category-field 
NEW Can use products categories to make inventory
 2022-07-24 22:06:55 +02:00
Laurent Destailleur
89999d0138 Fix update description of skills 2022-07-24 17:31:30 +02:00
Laurent Destailleur
cf0a1d1e14 Merge 2022-07-24 11:26:10 +02:00
Laurent Destailleur
c7fd9f5a3a Trans 2022-07-24 10:57:46 +02:00
Laurent Destailleur
7275ac1511 Trans 2022-07-22 20:14:25 +02:00
Laurent Destailleur
56a8912c9b Fix do not erase global option when configuring ticket 2022-07-22 19:47:59 +02:00
Laurent Destailleur
ca323f99ba Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-22 19:37:55 +02:00
Laurent Destailleur
8c8db25dd9 Fix trans 2022-07-22 19:37:27 +02:00
Laurent Destailleur
24f8e9c401 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-22 18:09:38 +02:00
Yoan Mollard
edb2e95aaf Fixed labels for permission errors 2022-07-22 17:33:04 +02:00
lvessiller
1f28734a83 FIX resolve conflicts 2022-07-22 08:50:50 +02:00
lvessiller
ba1a607afc FIX resolve conflicts 2022-07-20 14:21:24 +02:00
Yoan Mollard
840437d312 Fixed labels for permission errors 2022-07-19 23:55:55 +02:00
Laurent Destailleur
75b8246578
Merge branch 'develop' into NEW-recursive-envents 2022-07-19 19:40:48 +02:00
Laurent Destailleur
c759b56622 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-16 09:39:40 +02:00
Laurent Destailleur
14eb6c24b8 Fix php version max 2022-07-16 02:34:37 +02:00
Laurent Destailleur
1855236027 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2022-07-16 02:26:35 +02:00
Laurent Destailleur
07216577e4 FIX #yogosha11806 2022-07-16 02:03:38 +02:00
lvessiller
8f338d84b0 FIX resolve conflicts 2022-07-15 17:35:19 +02:00
Laurent Destailleur
a864771974 Debug 2022-07-15 15:51:55 +02:00
Laurent Destailleur
1d0ba05e90 Debug 2022-07-15 15:35:45 +02:00
Laurent Destailleur
4f54fb4f00 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-14 11:54:30 +02:00
lvessiller
cda6e9184d NEW color in action list and translated 2022-07-13 16:52:57 +02:00
Laurent Destailleur
97acf949fc Clean message on email limit 2022-07-13 13:39:16 +02:00
Laurent Destailleur
8422d3079c Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-12 19:10:08 +02:00
Laurent Destailleur
a1857e3e78 Trans 2022-07-12 18:43:10 +02:00