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
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
Laurent Destailleur
c74ca9dc03 Fix trans 2022-07-12 18:28:37 +02:00
atm-lena
db5c5b9020 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_NEW_Service_DefaultWorkstation 2022-07-12 09:21:22 +02:00
Laurent Destailleur
661b863314
Merge pull request #21490 from Hystepik/develop#2 
Close #19587 : box_action order by to datep
 2022-07-11 17:48:56 +02:00
Laurent Destailleur
6f1d62d8a5 Fix trans 2022-07-11 17:06:03 +02:00
lmarcouiller
ce2bf519d5 Close #19587 : box_action order by to datep 2022-07-11 11:22:19 +02:00
Laurent Destailleur
e29df476e6
Merge branch 'develop' into membership-rework 2022-07-11 10:56:31 +02:00
Laurent Destailleur
e48fa05f9c
Merge pull request #21175 from altairis-melina/parameters 
NEW : TAKEPOS-Add setup parameters
 2022-07-11 01:54:27 +02:00
Laurent Destailleur
2ce695f939 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-10 19:48:20 +02:00
Laurent Destailleur
bd3af19978
Merge pull request #21335 from atm-GregM/NEW_exped_ObjectLink 
NEW add objectLink on expedition
 2022-07-10 19:33:49 +02:00
Laurent Destailleur
16d04e475b
Merge branch 'develop' into membership-rework 2022-07-10 18:58:49 +02:00
Laurent Destailleur
3846520862 Trans 2022-07-10 14:55:36 +02:00
Yoan Mollard
4906fec4ee Missing migration label 2022-07-08 10:12:30 +02:00
Yoan Mollard
07b5657ba1 Merge remote-tracking branch 'origin/develop' into HEAD 2022-07-08 10:11:22 +02:00
atm-lena
7c82fc5da6 WIP 2022-07-08 10:04:16 +02:00
bagtaib
147140bdc2 Show/hide advanced Options 2022-07-08 05:55:23 +02:00
Laurent Destailleur
da03175c07
Merge branch 'develop' into dev_19763 2022-07-07 23:06:22 +02:00
Laurent Destailleur
67d17cf289 Trans 2022-07-07 22:50:42 +02:00
Laurent Destailleur
f59cbc09a2
Merge pull request #21156 from atm-jpb/NEW/Collective_group_leave 
New/collective group leave request
 2022-07-07 22:44:13 +02:00
Laurent Destailleur
4086f3f36c
Merge pull request #21317 from ymollard/project-reports 
Filter accounting reports by projects
 2022-07-07 21:20:52 +02:00
Christian Foellmann
4c5e05e411 fix page titles 
Conflicts:
	htdocs/compta/bank/annuel.php
	htdocs/contact/list.php
	htdocs/product/stock/movement_list.php
	htdocs/user/list.php
 2022-07-06 19:19:08 +02:00
Laurent Destailleur
6365bdb35c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-06 19:10:45 +02:00
atm-lena
503e2310ea WIP 2022-07-06 16:51:50 +02:00
Laurent Destailleur
76e3c10c06
Revert "fix page titles" 2022-07-06 15:56:04 +02:00
Laurent Destailleur
a0caf7be71
Merge pull request #21394 from cfoellmann/PR/improve-page-titles 
fix page titles
 2022-07-06 15:55:10 +02:00
Laurent Destailleur
9a10e3f971
Merge branch 'develop' into NEW#21395 2022-07-06 15:53:22 +02:00
Laurent Destailleur
745f504a27 Clean init process 2022-07-06 15:47:14 +02:00
atm-lena
55f0dada34 WIP 2022-07-06 13:55:43 +02:00
lvessiller
ed9c7ff251 FIX resolve conflicts 2022-07-06 09:23:44 +02:00
bagtaib
377e079a6e backend 2022-07-06 07:56:42 +02:00
atm-lena
4e1dc2792c Add default workstation in service card 2022-07-05 13:58:35 +02:00
Laurent Destailleur
1c2727e2a7
Merge pull request #21354 from badre-agtaib/new2 
FIX #21204
 2022-07-04 15:30:33 +02:00
Laurent Destailleur
3c91a3a56b Clean not used files 2022-07-03 11:47:40 +02:00
Alexandre SPANGARO
bda01fc2d1 Merge remote-tracking branch 'upstream/develop' into 17p3 2022-07-03 07:33:43 +02:00
Alexandre SPANGARO
32a9e53382 Merge remote-tracking branch 'upstream/develop' into 17p1 2022-07-03 07:29:41 +02:00
Faustin
259224c3be NEW : Recurrent events on agenda v1 2022-07-02 18:48:35 +02:00
Yoan Mollard
1e6df0c6d9 Merge remote-tracking branch 'origin/develop' into membership-rework 2022-07-01 17:38:47 +02:00
Laurent Destailleur
6e153b9b75 Debug import FIX #yogosha11618 2022-06-30 22:55:58 +02:00
Gauthier PC portable 024
bf98c77d73 FIX : french traductions for payment methods 2022-06-30 10:24:47 +02:00
Laurent Destailleur
07aebba254 Debug v16 2022-06-30 01:55:56 +02:00
Laurent Destailleur
a98599084d Debug v16 2022-06-30 01:34:58 +02:00
Yoan Mollard
3dcf7db198 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into membership-rework 2022-06-29 16:12:05 +02:00
Yoan Mollard
e7058c253e NEW: Table of membership types 2022-06-29 03:25:33 +02:00
Yoan Mollard
f8af181cee Label clarification following the new per-type setting "CanEditAmount" 2022-06-29 00:28:33 +02:00
Yoan Mollard
759900bcce No longer allow to edit amount in the payment step 
If amount is editable, edition has been done in the previous screen in
public/members/new.php
It also allows the possibility to prevent the visitor from doing a >0
payment if this is not wanted.
 2022-06-29 00:27:18 +02:00
Laurent Destailleur
67ade177c7 Fix error message 2022-06-28 20:11:18 +02:00
Laurent Destailleur
0091c31b99 Debug v16 2022-06-28 11:07:06 +02:00
Yoan Mollard
5998999f18 NEW: Add free membership amounts at the membership type level 2022-06-28 02:33:17 +02:00
Laurent Destailleur
f2a9db5fe3 Typo 2022-06-27 22:45:09 +02:00
Laurent Destailleur
0e0c9888a2 Typo 2022-06-27 22:43:29 +02:00
Laurent Destailleur
34464ac92b Maxi debug of OAuth module. Solve tons of problems. 2022-06-27 22:35:58 +02:00
Faustin
3e66ca1636 NEW #21395 : Added picto text to inform that option does not work with all themes 2022-06-27 16:18:54 +02:00
Faustin
d7d02fee9a NEW #21395 : Added option for dark theme mode in display - color and theme 2022-06-27 16:08:06 +02:00
Christian Foellmann
89d1389e2d fix page titles 2022-06-27 12:48:04 +02:00
Yoan Mollard
10aa31a376 Let users know that the PDF invoice is enclosed 2022-06-27 00:31:59 +02:00
Yoan Mollard
6053f3e5f8 Internationalize invoice lines for new memberships 2022-06-27 00:27:00 +02:00
Yoan Mollard
3d00c065ae Missing label for excluded members 2022-06-26 23:51:10 +02:00
lvessiller
7b7ecf44ad Merge branch 'develop' of github.com:Dolibarr/dolibarr into new-inventory-category-field 2022-06-24 17:30:14 +02:00
jpb
ac53c0c454 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/Collective_group_leave 2022-06-24 11:42:37 +02:00
bagtaib
cc0be635dc removed the new option and enhanced the old one 2022-06-23 15:37:37 +02:00
Laurent Destailleur
49e4a070dc Work on #21136 2022-06-23 14:14:25 +02:00
Laurent Destailleur
ff4911384e Debug new import tool 2022-06-22 21:52:00 +02:00
bagtaib
03de870751 NEW #21204 2022-06-22 16:29:15 +02:00
Laurent Destailleur
e698d20789
Merge branch 'develop' into develop#6 2022-06-22 12:09:58 +02:00
atm-GregM
e8a5d4f008
Merge branch 'develop' into NEW_exped_ObjectLink 2022-06-21 15:31:45 +02:00
GregM
8c0b1efce4 NEW add objectLink expedition 2022-06-21 15:21:45 +02:00
Laurent Destailleur
26abe22f23 Trans 2022-06-20 17:17:33 +02:00
Laurent Destailleur
78c4a166c0 Trans 2022-06-19 15:36:17 +02:00
Laurent Destailleur
233d712e39 NEW Support the Swiss QR-Code 2022-06-19 13:06:07 +02:00
Yoan Mollard
82cfca1a80 Filter accounting reports by projects 2022-06-19 00:48:06 +02:00
Laurent Destailleur
da042c7f57 Debug v16 to prepare stable status of module HRM #21136 2022-06-18 14:11:41 +02:00
HENRY Florian
770abb73f6
Merge branch 'Dolibarr:develop' into dev_19763 2022-06-18 11:54:44 +02:00
Laurent Destailleur
e5172b550d FIX #21305 Better fix 2022-06-17 12:38:17 +02:00
Laurent Destailleur
99f21246c7 Missing trans 2022-06-17 12:20:36 +02:00
Hystepik
45439e055c
Merge branch 'develop' into develop#6 2022-06-17 11:05:12 +02:00
lvessiller
d5269cd97b FIX resolve conflicts 2022-06-16 17:08:00 +02:00
Laurent Destailleur
293b08ab1d Debug v16 2022-06-14 11:47:56 +02:00
Laurent Destailleur
f0f24291d4 Debug v16 2022-06-14 10:40:10 +02:00
jpb
0e72085be6 add trads on form fields 2022-06-13 08:36:17 +02:00
Laurent Destailleur
fe3d893fd7
Merge pull request #21187 from backstageel/develop 
Adding language Portuguese Mozambque
 2022-06-12 12:07:23 +02:00
jpb
e97334848c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW/Collective_group_leave 2022-06-11 13:11:58 +02:00
Alexandre SPANGARO
4fecd01ddd NEW Accountancy - Manage customer retained warranty 2022-06-10 04:47:15 +02:00
Laurent Destailleur
ea0589cbc3 Debug the new import tool 2022-06-09 18:10:07 +02:00
Laurent Destailleur
dbaae5b1e3 Fix autodetect csv separator 2022-06-09 17:44:32 +02:00
Elisio Leonardo
fb9b3828ef Adding new language code for Portuguese Mozambique 2022-06-09 14:51:37 +02:00
Alexandre SPANGARO
1594a06b95 Merge remote-tracking branch 'upstream/develop' into 17p1 2022-06-09 03:44:21 +02:00
Laurent Destailleur
74104285db Debug v16 2022-06-09 02:48:32 +02:00
Laurent Destailleur
41683b9025 Typo 2022-06-08 18:09:21 +02:00
melina
9ad5553c47 Add setup parameters 2022-06-08 17:56:11 +02:00
Laurent Destailleur
36e5e8850e typo 2022-06-08 17:43:33 +02:00
jpb
02a4e10fd3 add todo for some jquery 2022-06-07 19:12:40 +02:00
jpb
c434e9cffe add card and feature 2022-06-07 19:01:57 +02:00
Laurent Destailleur
b9e376fb1d Disable option not complete 2022-06-07 10:58:19 +02:00
Laurent Destailleur
93ba5db6d3
Merge pull request #19940 from bb2a/add_option_pdf_global_thirdparty_alias 
NEW - Add option pdf global thirdparty alias
 2022-06-07 10:43:18 +02:00
Laurent Destailleur
efb6a8a791
Merge pull request #20999 from atm-jpb/NEW/ExpenseReport_ik_add 
NEW : add coefficient on unit  ht   line  in expenseReport card
 2022-06-07 10:02:12 +02:00
Laurent Destailleur
a8edff5167 Sync transifex 2022-06-03 14:46:00 +02:00
Laurent Destailleur
f475991b20 Typo 2022-06-03 13:56:28 +02:00
Laurent Destailleur
a9ea1c8fbb More logs 2022-06-03 13:51:47 +02:00
Laurent Destailleur
166082d3cb Debug v16 2022-06-03 12:53:55 +02:00
Laurent Destailleur
af6a025caa css 2022-06-03 11:34:19 +02:00
Laurent Destailleur
c9ef83d9a7 Trans 2022-06-03 02:29:30 +02:00
Laurent Destailleur
b9a05ded29 Typo 2022-06-02 12:48:05 +02:00
Laurent Destailleur
704266445c Debug v16 2022-06-01 19:45:46 +02:00
Laurent Destailleur
e3fa24fab2
Merge pull request #18283 from atm-gauthier/NEW_stockstransfers 
NEW : Stocks transfers objects management
 2022-06-01 14:49:21 +02:00
Laurent Destailleur
98ebe0cff4 Trans 2022-05-31 17:58:47 +02:00
Laurent Destailleur
d6ecbe65b7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/langs/en_US/errors.lang
 2022-05-31 15:16:54 +02:00
Laurent Destailleur
70500745f5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-05-30 22:45:06 +02:00
jpb
9014094094 add trans 2022-05-30 16:22:35 +02:00
Laurent Destailleur
319eac2c45 Fix trans 2022-05-29 10:46:00 +02:00
DATUC
8f736b3ecb
Local CM adjust 
Local ref update
 2022-05-26 12:57:27 +01:00
Laurent Destailleur
b93b9a784c Trans 2022-05-26 00:30:35 +02:00
Laurent Destailleur
068112bccd Fix trans 2022-05-25 18:19:46 +02:00
Laurent Destailleur
9a7c28d61d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-05-25 09:12:59 +02:00
Laurent Destailleur
baae99fbb4 Support ZATCA 2022-05-25 09:06:59 +02:00
Laurent Destailleur
0e3d7c4e2e
Merge pull request #19099 from johnvan7/develop 
New: receipt beep alternative and current date/time
 2022-05-24 22:13:59 +02:00
Laurent Destailleur
b43159db6d
Merge branch 'develop' into dev_19763 2022-05-24 22:07:50 +02:00
atm-lena
eba84382dc Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_OF_Child 2022-05-24 09:37:39 +02:00
Alexandre SPANGARO
c5bbbd88af Merge problem 2022-05-24 07:14:22 +02:00
Laurent Destailleur
eaa0170604 Trans 2022-05-23 20:05:30 +02:00
Laurent Destailleur
6de1f6bbac Generic message 2022-05-23 15:12:15 +02:00
Laurent Destailleur
1a6903f677 Debug v16 2022-05-23 11:56:39 +02:00
Laurent Destailleur
f276c66614 NEWW Add selection of the mode to show icon/text in setup 2022-05-23 09:45:42 +02:00
DATUC
06cdb37379
Update compagnie languages 
Add somme legal requirements for CM
 2022-05-21 23:48:02 +01:00
Maxime Kohlhaas
6445dd3882
Merge branch 'develop' into NEW_stockstransfers 2022-05-21 16:06:59 +02:00
Alexandre SPANGARO
ea8759e627 NEW Add trigger to record the event of sending an email from a project #20912 2022-05-21 07:02:15 +02:00
Laurent Destailleur
420feba56f
Merge branch 'develop' into develop#6 2022-05-20 23:06:30 +02:00
Laurent Destailleur
5f9ef61d32 Debug v16 2022-05-19 09:36:47 +02:00
Laurent Destailleur
0d20a3b606 Prepare code for dic management 2022-05-18 21:54:38 +02:00
Laurent Destailleur
37f7fed003 Maxi debug of export profiles for v16 2022-05-17 00:51:47 +02:00
Laurent Destailleur
1900bfe68b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-05-16 21:06:03 +02:00
Laurent Destailleur
402398912b
Merge pull request #20866 from Easya-Solutions/new-ticket-public-interface 
NEW create third-party with contact if not found on pulic ticket
 2022-05-16 20:44:40 +02:00
Laurent Destailleur
c3c29393c1 Look and feel v16 2022-05-16 18:00:59 +02:00
Laurent Destailleur
4cc1f67632 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/line.php
 2022-05-16 16:03:07 +02:00
Laurent Destailleur
c3673bfc3c NEW A public form for to send a message and create a lead is available 2022-05-16 13:05:17 +02:00
lvessiller
89e5d3e1c2 FIX merge from develop 2022-05-13 10:02:35 +02:00
Florian HENRY
b9d78da4f6 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_19763 2022-05-13 09:09:31 +02:00
lvessiller
0a5b2097e7 FIX resolve conflicts 2022-05-12 17:07:23 +02:00
lvessiller
7c17f6b1cf NEW create third-party with contact if not found on public ticket 2022-05-12 16:52:02 +02:00
Laurent Destailleur
a787fc178b Fix language 2022-05-12 15:27:41 +02:00
Laurent Destailleur
7a361a3bde More info to help debug 2022-05-12 14:28:17 +02:00
Laurent Destailleur
4e87e47451 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-05-12 10:35:00 +02:00
Laurent Destailleur
3be2993dc2
Merge pull request #20818 from Hystepik/develop#3 
NEW : Import with select boxes V2
 2022-05-12 02:04:52 +02:00
Laurent Destailleur
c08595866f
Merge branch 'develop' into burundi_support_for_dolibarr_13 2022-05-12 01:51:17 +02:00
Laurent Destailleur
1c4c7201fc Trans 2022-05-11 09:53:23 +02:00
Florian HENRY
54d6916a20 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_19763 2022-05-11 08:26:44 +02:00
Eric Seigne
6d4455ec17 burundi profId mapping 2022-05-10 23:48:07 +02:00
Laurent Destailleur
c4f4754b5b Add option EMAIL_ALTERNATIVE_HOST_SIGNATURE 2022-05-10 19:23:30 +02:00
Laurent Destailleur
2dc97ac3ae Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/errors.lang
 2022-05-10 17:16:11 +02:00
Laurent Destailleur
1f59e329cd Work on public form for partnership 2022-05-10 16:50:33 +02:00
Laurent Destailleur
7b21e0b6ff Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-05-10 16:06:32 +02:00
lmarcouiller
7e439a8248 add of selectimportfieldsource in lang 2022-05-10 15:50:01 +02:00
lmarcouiller
ed13280ea1 fix bug in select boxes 2022-05-10 12:15:52 +02:00
Laurent Destailleur
86b4c97287
Merge branch 'develop' into develop#6 2022-05-10 11:43:27 +02:00
Laurent Destailleur
1b82340e1b
Merge pull request #20785 from aspangaro/16a29-Fixcustomerdeposit 
FIX Accountancy - Add an option to disable use of sub-account on deposit line
 2022-05-10 11:37:24 +02:00
Laurent Destailleur
0cac14c82f Fix trans 2022-05-09 16:51:31 +02:00
Gauthier PC portable 024
60defe4108 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2022-05-09 13:29:46 +02:00
Laurent Destailleur
e9d7e216e2 Debug v16 2022-05-09 12:13:31 +02:00
lvessiller
00f321475b NEW replace fk_categories_product with categories_product in inventory 2022-05-09 09:33:44 +02:00
Laurent Destailleur
104b4dcfe5 Trans 2022-05-09 09:31:43 +02:00
Laurent Destailleur
b3b6337c4c
Merge branch 'develop' into NEW_deposit_payment_terms 2022-05-08 23:09:06 +02:00
Laurent Destailleur
30597d7f89
Merge pull request #18163 from FHenry/dev_new_project_upgrade_external_user_perms_project 
NEW: Separate read-only and adding time on projects
 2022-05-08 19:50:46 +02:00
Laurent Destailleur
f14e614430
Merge pull request #20779 from atm-GregM/develop_new_massaction_extrafield_product 
NEW : Add massaction "Edit Extrafield" for Product
 2022-05-08 19:15:25 +02:00
Laurent Destailleur
16fac44e9f
Update products.lang 2022-05-08 19:14:32 +02:00
Laurent Destailleur
b4e1bac32d
Merge pull request #20783 from fappels/14_fix_error_handling 
Fix errors.lang merge conflict and fix reception error handling
 2022-05-08 19:12:11 +02:00
Alexandre SPANGARO
6ee15794e6 Merge remote-tracking branch 'upstream/develop' into 16a29-Fixcustomerdeposit 2022-05-07 07:59:23 +02:00
Laurent Destailleur
6b9ed5aa32 Better message in installation process 2022-05-06 20:03:59 +02:00
Laurent Destailleur
bb6f73136a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2022-05-06 12:46:26 +02:00
Laurent Destailleur
f222328ff8 FIX Update of sale price (log not correctly updated) 2022-05-06 12:37:18 +02:00
Gauthier PC portable 024
2c840e80fb Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2022-05-06 11:41:18 +02:00
Florian HENRY
a54c0fb247 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_project_upgrade_external_user_perms_project 2022-05-06 11:13:44 +02:00
lvessiller
ccc4d50a1c FIX resolve conflicts 2022-05-06 09:45:20 +02:00
Laurent Destailleur
f3a630fd30 Clean code 2022-05-06 05:21:26 +02:00
Alexandre SPANGARO
7bb5ac4095 FIX Accountancy - Add an option to disable use of sub-account on deposit line 2022-05-05 16:48:01 +02:00
Laurent Destailleur
935b3c300a Debug v16 2022-05-05 16:41:21 +02:00
Francis Appels
29d1424413 fix merge conflict 
Add missing error translation key
 2022-05-05 11:07:39 +02:00
GregM
885324629f commit resolve conflict 2022-05-04 17:10:39 +02:00
GregM
d2bf2fdb98 update massaction langs & script 2022-05-04 16:53:57 +02:00
lvessiller
e01f912f41 Resolve conflicts 2022-05-04 11:11:05 +02:00
Laurent Destailleur
6813bfb1e8 Trans 2022-05-04 02:23:24 +02:00
Laurent Destailleur
d76e7224d9 NEW Can set the max number of attendees for an organized event 2022-05-04 01:53:45 +02:00
Laurent Destailleur
2bc958efe3
Merge pull request #20686 from Easya-Solutions/new-mass-action-send-last-main-doc 
NEW Option MAIL_MASS_ACTION_ADD_LAST_IF_MAIN_DOC_NOT_FOUND to send last document in mass mailing action
 2022-05-04 01:17:20 +02:00
Laurent Destailleur
ae282245fe FIX assign member cateogry to a member 2022-05-03 21:54:34 +02:00
Laurent Destailleur
51e9a7c251 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2022-05-03 13:05:51 +02:00
Laurent Destailleur
9f379dfcf4 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/core/modules/modCashDesk.class.php
	htdocs/debugbar/class/DataCollector/DolLogsCollector.php
	htdocs/langs/en_US/admin.lang
 2022-05-03 12:17:54 +02:00
Laurent Destailleur
affde55169 FIX deprecated module are not more viewed as external modules 
Trans debugbar
 2022-05-03 12:08:24 +02:00
Hystepik
0be15e3c74
Merge branch 'develop' into develop#6 2022-05-02 15:16:15 +02:00
lmarcouiller
13e05b875d remove unused files 2022-05-02 15:07:41 +02:00
lvessiller
0a48c09a74 NEW last generated doc if main not found for mailing mass action 2022-05-02 11:35:12 +02:00
lvessiller
734cdffa59 FIX resolve conflicts 2022-05-02 10:03:23 +02:00
Laurent Destailleur
b7106b1731 Fix lang 2022-05-01 22:22:46 +02:00
Laurent Destailleur
08d78dd33b NEW More feature that can be modifed after module generation 2022-05-01 15:05:25 +02:00
Laurent Destailleur
9af68679d1
Merge branch 'develop' into 16a20 2022-05-01 12:45:08 +02:00
Laurent Destailleur
fe2324ac7e
Merge pull request #20669 from ymollard/tickets-collector 
FIX and NEW i18n for creating tickets via the mail collector
 2022-05-01 12:36:16 +02:00
Laurent Destailleur
cf38d69733
Merge pull request #20729 from aspangaro/16a26-Accountancy_reconcile 
NEW Accountancy - Add reconcile functionality
 2022-05-01 12:28:51 +02:00
Laurent Destailleur
a090b21aec NEW Add a public page with all list of open job positions 2022-05-01 12:12:44 +02:00
Laurent Destailleur
35b1c1ca69 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-04-29 20:11:06 +02:00
Laurent Destailleur
1f2b27cca8 Trans 2022-04-29 19:58:31 +02:00
Laurent Destailleur
0342872e6f
Merge pull request #20657 from atm-gauthier/NEW/expensereport_payments_list 
NEW : expense report payments list
 2022-04-29 19:38:47 +02:00
Laurent Destailleur
c499eb3730
Merge pull request #20661 from frederic34/patch-4 
Update agenda.lang
 2022-04-29 19:33:07 +02:00
Laurent Destailleur
38d7ab47ca
Merge pull request #20674 from aspangaro/16a22 
FIX Accountancy - Missing language key
 2022-04-29 18:36:00 +02:00
Laurent Destailleur
659f520365
Merge pull request #20740 from inovea-conseil/event_propal_return_to_draft 
NEW Events on Proposal to Return to Draft
 2022-04-29 16:04:26 +02:00