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

11882 Commits

Author SHA1 Message Date
IC-faycal
fc6228a48c NEW Events on Proposal to Return to Draft 2022-04-28 11:27:15 +02:00
Laurent Destailleur
d376d28588 Missing trans 2022-04-28 11:12:21 +02:00
Alexandre SPANGARO
1efa44a022 NEW Accountancy - Add reconcile functionality 2022-04-28 06:50:37 +02:00
Laurent Destailleur
307476786c Fix label of remain to pay on vendor invoices 
FIX tool to fix bank account not in main currency for vendor invoice
 2022-04-19 23:24:08 +02:00
Alexandre SPANGARO
1e96cd636f FIX Accountancy - Missing language key 2022-04-19 22:38:42 +02:00
Laurent Destailleur
aa86b2c71f Fix root passfield not editable on install 
Fix user photo when gravatar not reachable
 2022-04-19 22:26:27 +02:00
Yoan Mollard
37ab728846 Allow users to switch on e-mail headers again in UI 2022-04-19 00:13:40 +02:00
Yoan Mollard
d5361c3147 Improved default signature for tickets 2022-04-19 00:13:40 +02:00
Yoan Mollard
cbdf74e00c i18n the default email collector descriptions 2022-04-19 00:13:40 +02:00
Yoan Mollard
ad0199afd1 Rephrased ticket labels 2022-04-19 00:13:40 +02:00
Alexandre SPANGARO
ffd9693b17 NEW Add an option to show quick add feature 2022-04-18 07:35:05 +02:00
Frédéric FRANCE
34409144b3
Update agenda.lang 2022-04-15 16:24:54 +02:00
Gauthier PC portable 024
2aee60ad59 NEW : expense report payments list 2022-04-15 12:14:41 +02:00
lmarcouiller
0674d062f8 select on source fields import 2022-04-15 11:55:24 +02:00
Laurent Destailleur
f61ca0b516
Merge branch 'develop' into NEW_stockstransfers 2022-04-14 22:50:31 +02:00
Laurent Destailleur
1fd004d2a7
Merge pull request #20135 from atm-quentin/NEW_inventory_pmp_hidden_conf 
New hidden conf to manage pmp on inventory
 2022-04-14 22:42:35 +02:00
Laurent Destailleur
aee0c8afc6
Merge pull request #20612 from vold-lu/add_tabs_in_module_builder 
NEW: ModuileBuilder - Add tabs view in module builder
 2022-04-14 22:17:51 +02:00
Laurent Destailleur
c4a96957af
Merge pull request #20613 from Hystepik/develop#1 
NEW #20609 : new massaction to assign a sale representatives on a selection of thirdparties
 2022-04-14 21:37:20 +02:00
Laurent Destailleur
3d21023110 Label of option 2022-04-14 14:11:40 +02:00
Laurent Destailleur
90366b1b81
Revert "NEW : Import with select boxes" 2022-04-13 16:21:25 +02:00
Laurent Destailleur
b1cc271ad5 Fix trans 2022-04-12 14:23:39 +02:00
Aloïs Micard
36372b250c
Merge branch 'develop' into add_tabs_in_module_builder 2022-04-12 14:12:41 +02:00
lmarcouiller
d41676cf8b Close #20609 : new massaction asign sale representative 2022-04-12 13:57:00 +02:00
Aloïs Micard
25a851ac70 Fix translation 2022-04-12 11:12:43 +02:00
Aloïs Micard
a6407257dd Allow to view tabs in module builder 2022-04-12 11:11:26 +02:00
Gauthier PC portable 024
6faefa7d86 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2022-04-12 09:08:57 +02:00
Laurent Destailleur
8b7e790130
Merge pull request #19677 from Hystepik/develop#1 
NEW : Import with select boxes
 2022-04-11 17:35:23 +02:00
Laurent Destailleur
42f82486da Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-04-09 00:59:19 +02:00
Laurent Destailleur
b8c8d2af93 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-04-09 00:56:42 +02:00
Laurent Destailleur
003bcd60fa FIX Add protection on bad input of payment on multicurrency invoices 2022-04-08 19:52:40 +02:00
Laurent Destailleur
0673a4826a FIX currency visible into tooltip 2022-04-08 17:13:41 +02:00
Laurent Destailleur
4ff8969bac
Merge pull request #19393 from atm-gauthier/NEW/addline_with_position_choice_develop 
New/addline with position choice develop
 2022-04-08 16:09:44 +02:00
kevin
68e60fe628 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_Reverse_Movement_Product_Consumption 2022-04-08 09:51:41 +02:00
kevin
135e4f1768 Add tooltip to explain the trash action 2022-04-08 09:50:40 +02:00
Gauthier PC portable 024
83e8e07416 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2022-04-08 09:25:08 +02:00
Laurent Destailleur
26c3e235cf
Merge pull request #19459 from frederic34/productmerge 
can merge products
 2022-04-07 15:02:03 +02:00
Laurent Destailleur
4cac6b7e29 css 2022-04-07 14:03:14 +02:00
Laurent Destailleur
ed1bdd26db Rename some jobs 2022-04-07 00:09:11 +02:00
Laurent Destailleur
8f93584f97 Fix trans 2022-04-06 16:56:23 +02:00
kevin
0b29b92b44 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_Reverse_Movement_Product_Consumption 2022-04-06 15:09:01 +02:00
kevin
8be5cccb4e Reverse stock movements on mo consumed product 2022-04-06 12:32:10 +02:00
Laurent Destailleur
2e5d0ef92b
Merge pull request #20249 from atm-steve/NEW_Employee_management_improvement 
New employee management improvement #18434
 2022-04-05 15:12:19 +02:00
Laurent Destailleur
2303553fd1
Merge pull request #20392 from thomas-Ngr/develop_fix_ticket_workflow_create_ficheinter_from_public_interface 
Fix: ticket/workflow: automatically create ficheinter
 2022-04-05 15:08:10 +02:00
Laurent Destailleur
af45691c9d Clean import profiles 2022-04-04 13:35:08 +02:00
Thomas Negre
7469cf79f5 enhance option explanation string 2022-04-04 09:29:03 +02:00
Thomas Negre
2ec7818c75 When the ficheinter can't be created, display an error. 2022-04-04 09:29:03 +02:00
Thomas Negre
8db171ae41 add translation string for workflow ticket fichinter creation 2022-04-04 09:29:03 +02:00
Laurent Destailleur
45fca25408 NEW Upgrade chartjs library to 3.7.1 2022-04-03 11:52:25 +02:00
Laurent Destailleur
f1d5695cb0
Merge pull request #20225 from thomas-Ngr/develop_new_ticket_workflow_auto_link_contract 
NEW: add a workflow to auto link contract on a ticket
 2022-04-02 18:15:27 +02:00
Laurent Destailleur
a3dbcd0c27 Clean language files 2022-04-01 13:09:11 +02:00
atm-steve
4fa656be96
Merge branch 'develop' into NEW_Employee_management_improvement 2022-03-30 12:13:17 +02:00
steve
8f39efd2b9 fix: change Read and Write employee label with personal information 2022-03-30 12:11:07 +02:00
Laurent Destailleur
636188f28a
Merge pull request #20247 from thomas-Ngr/develop_new_check_invoice_date 
NEW: check invoice date
 2022-03-29 16:07:31 +02:00
Laurent Destailleur
63d9f69732 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
 2022-03-29 15:55:47 +02:00
Laurent Destailleur
5f2ba49dfa Fix regression 2022-03-29 15:20:36 +02:00
Laurent Destailleur
1251e80963 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/accountancy/index.php
	htdocs/commande/list.php
	htdocs/langs/en_US/errors.lang
	htdocs/projet/class/task.class.php
 2022-03-29 15:10:11 +02:00
Laurent Destailleur
007004c2e0 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/accountancy/customer/lines.php
	htdocs/accountancy/index.php
	htdocs/accountancy/supplier/lines.php
	htdocs/compta/facture/card.php
	htdocs/core/tpl/extrafields_view.tpl.php
	htdocs/langs/en_US/errors.lang
 2022-03-29 15:02:29 +02:00
Laurent Destailleur
d1c5c79d22 Merge pull request #20299 from 
Easya-Solutions/13.0_fix-thirdparty-mandatory-fields-on-validate-invoice

FIX check mandatory thirdparty fields for mass action
 2022-03-29 14:53:19 +02:00
Laurent Destailleur
038033f0ec
Merge pull request #20389 from atm-GregM/retoursGRH 
NEW/fix GRH extrafields and more stuff
 2022-03-29 14:19:24 +02:00
Quentin VIAL-GOUTEYRON
c7e8a2bd8f Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_inventory_pmp_hidden_conf 2022-03-28 16:04:12 +02:00
Laurent Destailleur
a80a831ea3 Partnership module swtich from status development to experimental 2022-03-26 12:04:31 +01:00
lvessiller
8a7b97bed1 FIX check thirdparty object loaded and properties exist 2022-03-25 16:47:41 +01:00
Gauthier PC portable 024
ab2e6ddf43 FIX : forgotten form confirm before various payment delete 2022-03-25 16:41:41 +01:00
Marc de Lima Lucio
cbba7d7d5f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2022-03-25 16:14:53 +01:00
Laurent Destailleur
446ee8dc3c
Merge pull request #20274 from altairis-noe/mass_action_ship_orders 
FIX: Mass action ship orders
 2022-03-25 15:15:12 +01:00
Laurent Destailleur
644e509265 Rename "Reconciled" with "BankLineReconciled" for bank conciliation 2022-03-25 14:43:48 +01:00
Laurent Destailleur
08bc2a7ac0 Better modulebuilder design pattern 2022-03-24 19:27:42 +01:00
Laurent Destailleur
5a947a9e71
Merge pull request #20447 from bb2a/FIX---Lang-PaymentMode 
FIX - Lang PaymentMode
 2022-03-24 11:54:38 +01:00
BB2A Anthony Berton
1266da05ef Lang fr 2022-03-23 19:43:34 +01:00
Laurent Destailleur
4a80f35aaa Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2022-03-23 17:26:25 +01:00
Laurent Destailleur
289c32b880 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-23 17:23:35 +01:00
Laurent Destailleur
c620757dbc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/langs/en_US/projects.lang
	htdocs/product/price.php
	htdocs/reception/class/reception.class.php
 2022-03-23 17:23:21 +01:00
Laurent Destailleur
32f2499c36 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/langs/en_US/projects.lang
	htdocs/langs/en_US/propal.lang
	htdocs/product/price.php
	htdocs/projet/card.php
	htdocs/reception/class/reception.class.php
 2022-03-23 17:04:31 +01:00
Laurent Destailleur
94224e9275
Merge pull request #20255 from Easya-Solutions/new-proposal-clone-update-prices 
NEW option update prices on proposal cloning
 2022-03-23 16:49:12 +01:00
Laurent Destailleur
5f522c9087
Merge pull request #20388 from atm-john/15.0_fix_missing_lang_trad 
Fix missing lang trad
 2022-03-23 16:19:14 +01:00
Laurent Destailleur
61ed36e181
Update other.lang 2022-03-23 16:19:06 +01:00
Laurent Destailleur
0e63e09fbb
Merge pull request #20403 from Easya-Solutions/develop_remake_variants_permissions 
NEW : Update variants to standard card and list (permissions)
 2022-03-23 16:02:34 +01:00
Laurent Destailleur
1c7e2d3034
Merge pull request #20402 from Easya-Solutions/develop_remake_variants 
NEW : Update variants to standard card and list
 2022-03-23 16:02:08 +01:00
Marc de Lima Lucio
344c29ae15 FIX: trans 2022-03-22 11:35:37 +01:00
Marc de Lima Lucio
cf64fc288d FIX: propal list: missing not signed massaction translation keys for transifex 2022-03-22 10:49:03 +01:00
Marc de Lima Lucio
8ef55eae07 FIX: propal list: missing translation keys for transifex 2022-03-22 10:04:05 +01:00
Laurent Destailleur
2e27c40de4 Fix customreport with link to parents 2022-03-21 22:10:51 +01:00
Laurent Destailleur
40fbaf15fe Add welsh language 2022-03-21 17:12:26 +01:00
kamel
26a462dce0 NEW : Update variants to standard card and list (permission) 2022-03-18 15:43:32 +01:00
kamel
1418fd7054 NEW : Update variants to standard card and list 2022-03-18 15:38:44 +01:00
Laurent Destailleur
60d9db248f NEW The backup tools has an "lowmemory" for mysqldump on large database 2022-03-18 13:38:07 +01:00
John BOTELLA
989f00ae63
Update other.lang 2022-03-18 09:42:37 +01:00
Laurent Destailleur
167df9593b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/langs/en_US/products.lang
	htdocs/reception/class/reception.class.php
 2022-03-17 19:08:51 +01:00
Laurent Destailleur
e46ee982ec FIX Option to manage packaging. FIX size/length/volume of reception 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/install/mysql/migration/14.0.0-15.0.0.sql
	htdocs/langs/en_US/products.lang
	htdocs/reception/card.php
	htdocs/reception/class/reception.class.php
 2022-03-17 19:00:19 +01:00
Laurent Destailleur
5d415b183e FIX Option to manage packaging. FIX size/length/volume of reception 2022-03-17 18:53:50 +01:00
Thomas Negre
5fba0dc237 ticket config : select product type matching tickets. 2022-03-17 16:05:35 +01:00
Thomas Negre
8d997de3bb add options in workflow admin panel : WORKFLOW_TICKET_LINK_CONTRACT, WORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS 2022-03-17 16:05:35 +01:00
Thomas Negre
90ab7da40d Workflow : sort contracts when automatic linking to ticket. 
Introduces constants TICKET_PRODUCT_CATEGORY and WORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS.
Rename constant TICKET_AUTO_ASSIGN_CONTRACT_CREATE to WORKFLOW_TICKET_LINK_CONTRACT.
 2022-03-17 16:05:35 +01:00
GregM
ab87d772c7 update GRH extrafields and more stuff 2022-03-17 15:20:23 +01:00
ATM john
f1f3a0aa24 Fix missing AutoFill Trad 2022-03-17 14:56:25 +01:00
lvessiller
a4508e656c NEW pull develop 2022-03-17 12:20:15 +01:00
Laurent Destailleur
c147acabe1
Update projects.lang 2022-03-17 02:37:46 +01:00
Laurent Destailleur
b1e826da15 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-17 00:16:28 +01:00
Laurent Destailleur
079fcacf13 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/products.lang
 2022-03-17 00:16:14 +01:00
Laurent Destailleur
5eb51979a2 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-17 00:12:17 +01:00
Laurent Destailleur
caf999aa1f Fix scanner in inventory. Fix button must not be clicable if disabled. 2022-03-17 00:12:05 +01:00
Laurent Destailleur
54da09bb71
Merge pull request #20310 from ymollard/15.0 
Restoring missing VATIsNotUsed label (15.0)
 2022-03-16 22:38:52 +01:00
Laurent Destailleur
ef19769249
Merge pull request #20318 from Achicken7301/develop 
Vietnam date format, VAT rates
 2022-03-16 22:22:20 +01:00
Laurent Destailleur
7fb6088e10
Merge pull request #20326 from bb2a/Lang-mass-action-nosign 
FIX - Lang mass action propal noSign
 2022-03-16 22:09:12 +01:00
atm-steve
21090963e0
Merge branch 'develop' into NEW_Employee_management_improvement 2022-03-14 17:03:52 +01:00
steve
1555a95ce8 Activate new rights read and write 2022-03-14 16:50:43 +01:00
Laurent Destailleur
4b3b9ed66b Look and feel v15 2022-03-14 11:43:58 +01:00
Khang
c57336eb37
Merge branch 'Dolibarr:develop' into develop 2022-03-13 19:15:59 +07:00
Laurent Destailleur
06804c3547 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/modulebuilder/template/myobject_list.php
 2022-03-11 17:04:23 +01:00
Laurent Destailleur
f72f71a972 FIX Delete of doc and package in modulebuilder 2022-03-11 16:21:28 +01:00
Laurent Destailleur
9e3742ab81 Trans 2022-03-11 13:34:14 +01:00
BB2A Anthony Berton
32b508ae19 Lang 2022-03-11 11:48:50 +01:00
Laurent Destailleur
6100bc86f8 FIX css not saved in modulebuilder 2022-03-11 10:32:06 +01:00
Khang
144a11d15e
Merge branch 'Dolibarr:develop' into develop 2022-03-11 13:09:08 +07:00
Laurent Destailleur
bc6249f0eb Better error message 2022-03-10 22:17:04 +01:00
Laurent Destailleur
88ffe1827e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/ajax/row.php
	htdocs/filefunc.inc.php
 2022-03-10 15:59:09 +01:00
Gauthier PC portable 024
c103c7d61e Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2022-03-10 10:31:56 +01:00
Gauthier PC portable 024
5b715978e4 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2022-03-10 10:02:57 +01:00
Khang
d7fe48ebc0 Vietnam date format 
https://en.wikipedia.org/wiki/Date_and_time_notation_in_Vietnam
 2022-03-10 14:14:10 +07:00
Laurent Destailleur
2279674f01 Trans 2022-03-09 15:58:23 +01:00
Thomas Negre
07672b23b9 Langs/bills.lang: add error string for invoice date check 2022-03-09 09:25:52 +01:00
Yoan Mollard
8f7c361a12 Restoring missing VATIsNotUsed label 
Overwritten by a transiflex sync
 2022-03-09 01:32:59 +01:00
Marc de Lima Lucio
4efcbe8799 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2022-03-08 15:23:52 +01:00
Marc de Lima Lucio
1993a8d7b1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2022-03-08 15:07:37 +01:00
Marc de Lima Lucio
f837845c12 FIX: still prevent project creation if PROJECTLEADER role unavailable, but with a specific error message 2022-03-08 15:07:02 +01:00
lvessiller
2561fcbb85 FIX translate update prices and add const in proposal setup 2022-03-08 10:06:57 +01:00
Quentin VIAL-GOUTEYRON
b904ea73a6 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_inventory_pmp_hidden_conf 2022-03-08 08:55:21 +01:00
Laurent Destailleur
7defe26e56 Debug cron to send backup by email. 2022-03-07 17:55:10 +01:00
Laurent Destailleur
82244afb94
Merge pull request #20136 from bb2a/Send-Local-Database-Dump 
NEW -  Add util function send backup by mail
 2022-03-07 17:37:44 +01:00
Laurent Destailleur
cf0ef207b8
Update cron.lang 2022-03-07 17:37:32 +01:00
Laurent Destailleur
0020f4e48a
Merge pull request #20222 from thomas-Ngr/develop_new_ticket_notify_at_closing 
New - Ticket: notify contacts at closing
 2022-03-07 16:23:27 +01:00
Laurent Destailleur
2142440b6c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/langs/en_US/errors.lang
 2022-03-07 13:23:47 +01:00
Laurent Destailleur
f4cb5810a7 FIX list of visible type of event was not correctly filtered 
FIX Error management on mass action "Approve holiday"
 2022-03-07 12:01:34 +01:00
Quentin VIAL-GOUTEYRON
cc591b3a03 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_inventory_pmp_hidden_conf 2022-03-07 10:12:17 +01:00
Noé Cendrier
cfabaea645 translation refining 2022-03-04 17:38:39 +01:00
Noé Cendrier
e4f4a07fc6 correct mass action "classify delivered" 2022-03-04 17:31:04 +01:00
steve
436b8fa5b5 apply feedbacks 2022-03-03 16:18:09 +01:00
lvessiller
6c172d6441 NEW option update prices on proposal cloning 2022-03-03 11:58:29 +01:00
Laurent Destailleur
aed4d69568 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-03 09:49:26 +01:00
Laurent Destailleur
2837c938e6 Fix help easier to understand to avoid lethal situations. 
Fix reponsive
 2022-03-03 09:41:15 +01:00
Laurent Destailleur
9bda7ba8c7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/doleditor.class.php
 2022-03-03 00:16:55 +01:00
Laurent Destailleur
c452428d12 Fix label of menu 2022-03-02 22:20:05 +01:00
Steve
8f07c22d70 Merge branch 'dolibarrdevelop' into WIP_Employee_management_improvement 2022-03-02 14:51:46 +01:00
steve
e2f727ef55 feat: langs trans ref_employee and national registration number 2022-03-02 14:21:49 +01:00
Laurent Destailleur
358f21f06e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/core/customreports.php
 2022-03-01 16:48:29 +01:00
Laurent Destailleur
d76e002822 Fix explanation on setup page 2022-03-01 15:17:03 +01:00
Steve
5bf186c8ce Merge branch 'dolibarrdevelop' into WIP_Employee_management_improvement 2022-03-01 11:42:57 +01:00
Laurent Destailleur
0d024147bf Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-28 22:36:31 +01:00
Laurent Destailleur
d101a457c1 Trans 2022-02-28 22:21:40 +01:00
Laurent Destailleur
67881a7932
Merge branch 'develop' into 16a12_assets_code 2022-02-28 22:03:26 +01:00