From 9d9610e935917441a6fdc939ac5290d5c4c2989e Mon Sep 17 00:00:00 2001 From: Henri Nieminen Date: Tue, 17 Dec 2024 14:38:07 +0000 Subject: [PATCH 1/2] add sap_project_number values to ReceivableType --- leasing/fixtures/receivable_type.json | 62 +++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/leasing/fixtures/receivable_type.json b/leasing/fixtures/receivable_type.json index 92ced3e7..73b6172f 100644 --- a/leasing/fixtures/receivable_type.json +++ b/leasing/fixtures/receivable_type.json @@ -6,6 +6,7 @@ "name": "Maanvuokraus", "sap_material_code": null, "sap_order_item_number": null, + "sap_project_number": null, "is_active": true, "service_unit": 1 } @@ -17,6 +18,7 @@ "name": "Korko", "sap_material_code": null, "sap_order_item_number": null, + "sap_project_number": null, "is_active": false, "service_unit": 1 } @@ -28,6 +30,7 @@ "name": "Yhteismarkkinointi (sis. ALV)", "sap_material_code": "20002162", "sap_order_item_number": "2813101001", + "sap_project_number": "2810K002813000", "is_active": true, "service_unit": 1 } @@ -39,6 +42,7 @@ "name": "Kiinteistötoimitukset (tonttijaot, lohkomiset, rekisteröimiskustannukset, rasitteet)", "sap_material_code": "20001751", "sap_order_item_number": "2813000003", + "sap_project_number": "2810K00281300001", "is_active": true, "service_unit": 1 } @@ -50,6 +54,7 @@ "name": "Haastemiestiedoksianto", "sap_material_code": "10002534", "sap_order_item_number": "2813100000", + "sap_project_number": "2810K002813000", "is_active": true, "service_unit": 1 } @@ -61,6 +66,7 @@ "name": "Rasite ja muut vastaavat korvaukset", "sap_material_code": "10002495", "sap_order_item_number": "2813000004", + "sap_project_number": "2810K00281300002", "is_active": true, "service_unit": 1 } @@ -72,6 +78,7 @@ "name": "Esirakentamistoimenpiteet", "sap_material_code": "20002161", "sap_order_item_number": "2813100000", + "sap_project_number": "2810K002813000", "is_active": true, "service_unit": 1 } @@ -83,6 +90,7 @@ "name": "Rahavakuus", "sap_material_code": "10002550", "sap_order_item_number": "2813000", + "sap_project_number": "2810K002813000", "is_active": true, "service_unit": 1 } @@ -94,6 +102,7 @@ "name": "Väestösuojakorvaus", "sap_material_code": "10002532", "sap_order_item_number": "2813000000", + "sap_project_number": "2810K00281310101", "is_active": true, "service_unit": 1 } @@ -105,6 +114,7 @@ "name": "Aluekeräyspiste, keräyslaatikko, jakelulaatikko", "sap_material_code": "27100033", "sap_order_item_number": "2831300000", + "sap_project_number": "2830K002831300", "is_active": true, "service_unit": 2 } @@ -116,6 +126,7 @@ "name": "Hiekkasiilo, kaupungin urakkasopimukset", "sap_material_code": "10003613", "sap_order_item_number": "2831300000", + "sap_project_number": "2830K002831300", "is_active": true, "service_unit": 2 } @@ -127,6 +138,7 @@ "name": "Hiekkasiilo, muut", "sap_material_code": "27100049", "sap_order_item_number": "2831300000", + "sap_project_number": "2830K002831300", "is_active": true, "service_unit": 2 } @@ -138,6 +150,7 @@ "name": "Kaupunkipyörä (alv)", "sap_material_code": "10003614", "sap_order_item_number": "2831300000", + "sap_project_number": "2830K002831300", "is_active": true, "service_unit": 2 } @@ -149,6 +162,7 @@ "name": "Kaupunkiviljely", "sap_material_code": "27100028", "sap_order_item_number": "2831300000", + "sap_project_number": "2830K002831300", "is_active": true, "service_unit": 2 } @@ -160,6 +174,7 @@ "name": "Kioski, kahvila, myyntipaikat", "sap_material_code": "27100009", "sap_order_item_number": "2831300000", + "sap_project_number": "2830K002831300", "is_active": true, "service_unit": 2 } @@ -171,6 +186,7 @@ "name": "Laiva ja muu vesialue (alv)", "sap_material_code": "10003628", "sap_order_item_number": "2831300000", + "sap_project_number": "2830K002831300", "is_active": true, "service_unit": 2 } @@ -182,6 +198,7 @@ "name": "Lasitettu katuterassi ja asiakastila (alv)", "sap_material_code": "10003629", "sap_order_item_number": "2831300000", + "sap_project_number": "2830K002831300", "is_active": true, "service_unit": 2 } @@ -193,6 +210,7 @@ "name": "Leikkipaikan käyttöoikeus", "sap_material_code": "10003624", "sap_order_item_number": "2831300000", + "sap_project_number": "2830K002831300", "is_active": true, "service_unit": 2 } @@ -204,6 +222,7 @@ "name": "Liikunta ja ulkoilu (alv)", "sap_material_code": "10003615", "sap_order_item_number": "2831300000", + "sap_project_number": "2830K002831300", "is_active": true, "service_unit": 2 } @@ -215,6 +234,7 @@ "name": "Lisäpiha, asuntotontit", "sap_material_code": "10003616", "sap_order_item_number": "2831300000", + "sap_project_number": "2830K002831300", "is_active": true, "service_unit": 2 } @@ -226,6 +246,7 @@ "name": "Lisäpiha, yksityiset päiväkodit", "sap_material_code": "10003630", "sap_order_item_number": "2831300000", + "sap_project_number": "2830K002831300", "is_active": true, "service_unit": 2 } @@ -237,6 +258,7 @@ "name": "Maa-aineksen varastointi (alv)", "sap_material_code": "10003623", "sap_order_item_number": "2831300000", + "sap_project_number": "2830K002831300", "is_active": true, "service_unit": 2 } @@ -248,6 +270,7 @@ "name": "Mehiläistarhaus", "sap_material_code": "10003622", "sap_order_item_number": "2831300000", + "sap_project_number": "2830K002831300", "is_active": true, "service_unit": 2 } @@ -259,6 +282,7 @@ "name": "Metsästysoikeus (alv)", "sap_material_code": "27100045", "sap_order_item_number": "2831300000", + "sap_project_number": "2830K002831300", "is_active": true, "service_unit": 2 } @@ -270,6 +294,7 @@ "name": "Muuntamo, laitetila, masto (alv)", "sap_material_code": "10003625", "sap_order_item_number": "2831300000", + "sap_project_number": "2830K002831300", "is_active": true, "service_unit": 2 } @@ -281,6 +306,7 @@ "name": "Pysäköinti", "sap_material_code": "27100048", "sap_order_item_number": "2831300000", + "sap_project_number": "2830K002831300", "is_active": true, "service_unit": 2 } @@ -292,6 +318,7 @@ "name": "Sähköpotkulauta (alv)", "sap_material_code": "10003620", "sap_order_item_number": "2831300000", + "sap_project_number": "2830K002831300", "is_active": true, "service_unit": 2 } @@ -303,6 +330,7 @@ "name": "Taide ja kulttuuri", "sap_material_code": "27100037", "sap_order_item_number": "2831300000", + "sap_project_number": "2830K002831300", "is_active": true, "service_unit": 2 } @@ -314,6 +342,7 @@ "name": "Tilapäinen käymälä ja taukotila (alv)", "sap_material_code": "10003621", "sap_order_item_number": "2831300000", + "sap_project_number": "2830K002831300", "is_active": true, "service_unit": 2 } @@ -325,6 +354,7 @@ "name": "Työmaatukitoiminta (alv)", "sap_material_code": "10003626", "sap_order_item_number": "2831300000", + "sap_project_number": "2830K002831300", "is_active": true, "service_unit": 2 } @@ -336,6 +366,7 @@ "name": "Ulkomainonta, yksityinen", "sap_material_code": "27100044", "sap_order_item_number": "2831300000", + "sap_project_number": "2830K002831300", "is_active": true, "service_unit": 2 } @@ -347,6 +378,7 @@ "name": "Ulkomainonta, kilpailutettu (alv)", "sap_material_code": "27100000", "sap_order_item_number": "2831300000", + "sap_project_number": "2830K002831300", "is_active": true, "service_unit": 2 } @@ -358,6 +390,7 @@ "name": "Varastointi (alv)", "sap_material_code": "10003627", "sap_order_item_number": "2831300000", + "sap_project_number": "2830K002831300", "is_active": true, "service_unit": 2 } @@ -369,6 +402,7 @@ "name": "Muu yleisen alueen tilapäinen vuokraus", "sap_material_code": "27100046", "sap_order_item_number": "2831300000", + "sap_project_number": "2830K002831300", "is_active": true, "service_unit": 2 } @@ -380,6 +414,7 @@ "name": "Muu yleisen alueen tilapäinen vuokraus (alv)", "sap_material_code": "27100017", "sap_order_item_number": "2831300000", + "sap_project_number": "2830K002831300", "is_active": true, "service_unit": 2 } @@ -391,6 +426,7 @@ "name": "Muu tontinosan tilapäinen vuokraus", "sap_material_code": "10003617", "sap_order_item_number": "2831300000", + "sap_project_number": "2830K002831300", "is_active": true, "service_unit": 2 } @@ -402,6 +438,7 @@ "name": "Muu tontinosan tilapäinen vuokraus (alv)", "sap_material_code": "10003618", "sap_order_item_number": "2831300000", + "sap_project_number": "2830K002831300", "is_active": true, "service_unit": 2 } @@ -413,6 +450,7 @@ "name": "Maa- ja vesialueiden vuokratuotot veroton", "sap_material_code": "20000070", "sap_order_item_number": "", + "sap_project_number": null, "is_active": true, "service_unit": 3 } @@ -424,6 +462,7 @@ "name": "Maa- ja vesialueiden vuokratuotot alv", "sap_material_code": "20000069", "sap_order_item_number": "", + "sap_project_number": null, "is_active": true, "service_unit": 3 } @@ -435,6 +474,7 @@ "name": "Maa- ja vesialueiden vuokratuotot veroton", "sap_material_code": "20000070", "sap_order_item_number": "", + "sap_project_number": null, "is_active": true, "service_unit": 4 } @@ -446,6 +486,7 @@ "name": "Maa- ja vesialueiden vuokratuotot alv", "sap_material_code": "20000069", "sap_order_item_number": "", + "sap_project_number": null, "is_active": true, "service_unit": 4 } @@ -457,6 +498,7 @@ "name": "Maa- ja vesialueiden vuokratuotot veroton", "sap_material_code": "20000070", "sap_order_item_number": "", + "sap_project_number": null, "is_active": true, "service_unit": 5 } @@ -468,6 +510,7 @@ "name": "Maa- ja vesialueiden vuokratuotot alv", "sap_material_code": "20000069", "sap_order_item_number": "", + "sap_project_number": null, "is_active": true, "service_unit": 5 } @@ -479,6 +522,7 @@ "name": "Maanvuokraus", "sap_material_code": null, "sap_order_item_number": null, + "sap_project_number": "2830K002831300", "is_active": true, "service_unit": 2 } @@ -490,6 +534,7 @@ "name": "Rahavakuus", "sap_material_code": null, "sap_order_item_number": null, + "sap_project_number": "2830K002831300", "is_active": true, "service_unit": 2 } @@ -501,6 +546,7 @@ "name": "Maanvuokraus", "sap_material_code": null, "sap_order_item_number": null, + "sap_project_number": null, "is_active": true, "service_unit": 3 } @@ -512,6 +558,7 @@ "name": "Rahavakuus", "sap_material_code": null, "sap_order_item_number": null, + "sap_project_number": null, "is_active": true, "service_unit": 3 } @@ -523,6 +570,7 @@ "name": "Maanvuokraus", "sap_material_code": null, "sap_order_item_number": null, + "sap_project_number": null, "is_active": true, "service_unit": 4 } @@ -534,6 +582,7 @@ "name": "Rahavakuus", "sap_material_code": null, "sap_order_item_number": null, + "sap_project_number": null, "is_active": true, "service_unit": 4 } @@ -545,6 +594,7 @@ "name": "Maanvuokraus", "sap_material_code": null, "sap_order_item_number": null, + "sap_project_number": null, "is_active": true, "service_unit": 5 } @@ -556,6 +606,7 @@ "name": "Rahavakuus", "sap_material_code": null, "sap_order_item_number": null, + "sap_project_number": null, "is_active": true, "service_unit": 5 } @@ -567,6 +618,7 @@ "name": "Sähköauton latauspaikka (alv)", "sap_material_code": "10003619", "sap_order_item_number": "2831300000", + "sap_project_number": "2830K002831300", "is_active": true, "service_unit": 2 } @@ -578,6 +630,7 @@ "name": "Aluekeräyspiste, keräyslaatikko, jakelulaatikko (alv)", "sap_material_code": "10003722", "sap_order_item_number": "2831300000", + "sap_project_number": "2830K002831300", "is_active": true, "service_unit": 2 } @@ -589,6 +642,7 @@ "name": "Hiekkasiilo, muut (alv)", "sap_material_code": "10003730", "sap_order_item_number": "2831300000", + "sap_project_number": "2830K002831300", "is_active": true, "service_unit": 2 } @@ -600,6 +654,7 @@ "name": "Kioski, kahvila, myyntipaikat (alv)", "sap_material_code": "10003731", "sap_order_item_number": "2831300000", + "sap_project_number": "2830K002831300", "is_active": true, "service_unit": 2 } @@ -611,6 +666,7 @@ "name": "Taide ja kulttuuri (alv)", "sap_material_code": "10003732", "sap_order_item_number": "2831300000", + "sap_project_number": "2830K002831300", "is_active": true, "service_unit": 2 } @@ -622,6 +678,7 @@ "name": "Ulkomainonta, yksityinen (alv)", "sap_material_code": "10003733", "sap_order_item_number": "2831300000", + "sap_project_number": "2830K002831300", "is_active": true, "service_unit": 2 } @@ -633,6 +690,7 @@ "name": "Varastointi", "sap_material_code": "10003724", "sap_order_item_number": "2831300000", + "sap_project_number": "2830K002831300", "is_active": true, "service_unit": 2 } @@ -644,6 +702,7 @@ "name": "Pysäköinti (alv)", "sap_material_code": "10003760", "sap_order_item_number": "2831300000", + "sap_project_number": "2830K002831300", "is_active": true, "service_unit": 2 } @@ -655,6 +714,7 @@ "name": "Työmaatukitoiminta", "sap_material_code": "10003771", "sap_order_item_number": "2831300000", + "sap_project_number": "2830K002831300", "is_active": true, "service_unit": 2 } @@ -666,6 +726,7 @@ "name": "Lasitettu katuterassi ja asiakastila", "sap_material_code": "10003781", "sap_order_item_number": "2831300000", + "sap_project_number": "2830K002831300", "is_active": true, "service_unit": 2 } @@ -677,6 +738,7 @@ "name": "Laiva ja muu vesialue", "sap_material_code": "10003780", "sap_order_item_number": "2831300000", + "sap_project_number": "2830K002831300", "is_active": true, "service_unit": 2 } From be157ca8256fc4f48758846133719fedd94cf138 Mon Sep 17 00:00:00 2001 From: Henri Nieminen Date: Tue, 17 Dec 2024 14:38:20 +0000 Subject: [PATCH 2/2] add sap_project_number values to LeaseType --- leasing/fixtures/lease_type.json | 54 +++++++++++++++++++++++++++----- 1 file changed, 47 insertions(+), 7 deletions(-) diff --git a/leasing/fixtures/lease_type.json b/leasing/fixtures/lease_type.json index 9c37e5e2..3ac24a88 100644 --- a/leasing/fixtures/lease_type.json +++ b/leasing/fixtures/lease_type.json @@ -7,6 +7,7 @@ "identifier": "A1", "sap_material_code": "20002009", "sap_order_item_number": "2813101001", + "sap_project_number": "2810K00281310101", "due_dates_position": "middle_of_month" } }, @@ -18,6 +19,7 @@ "identifier": "A2", "sap_material_code": "20002009", "sap_order_item_number": "2813101001", + "sap_project_number": "2810K00281310101", "due_dates_position": "middle_of_month" } }, @@ -29,6 +31,7 @@ "identifier": "A3", "sap_material_code": "20002009", "sap_order_item_number": "2813101001", + "sap_project_number": "2810K00281310101", "due_dates_position": "middle_of_month" } }, @@ -40,6 +43,7 @@ "identifier": "A4", "sap_material_code": "20002007", "sap_order_item_number": "2813101002", + "sap_project_number": "2810K00281310102", "due_dates_position": "middle_of_month" } }, @@ -51,6 +55,7 @@ "identifier": "S0", "sap_material_code": "20002009", "sap_order_item_number": "2813104106", + "sap_project_number": "2810K00281310412", "due_dates_position": "start_of_month" } }, @@ -62,6 +67,7 @@ "identifier": "T1", "sap_material_code": "20002006", "sap_order_item_number": "2813104100", + "sap_project_number": "2810K00281310406", "due_dates_position": "start_of_month" } }, @@ -73,6 +79,7 @@ "identifier": "O1", "sap_material_code": "20002009", "sap_order_item_number": "2813104105", + "sap_project_number": "2810K00281310411", "due_dates_position": "start_of_month" } }, @@ -84,6 +91,7 @@ "identifier": "T2", "sap_material_code": "20002007", "sap_order_item_number": "2813104101", + "sap_project_number": "2810K00281310407", "due_dates_position": "start_of_month" } }, @@ -95,6 +103,7 @@ "identifier": "H1", "sap_material_code": "20002008", "sap_order_item_number": "2813104102", + "sap_project_number": "2810K00281310408", "due_dates_position": "start_of_month" } }, @@ -106,6 +115,7 @@ "identifier": "H2", "sap_material_code": "20002008", "sap_order_item_number": "2813104102", + "sap_project_number": "2810K00281310408", "due_dates_position": "start_of_month" } }, @@ -117,6 +127,7 @@ "identifier": "L1", "sap_material_code": "20002005", "sap_order_item_number": "2813104103", + "sap_project_number": "2810K00281310409", "due_dates_position": "start_of_month" } }, @@ -128,6 +139,7 @@ "identifier": "L2", "sap_material_code": "20002005", "sap_order_item_number": "2813104103", + "sap_project_number": "2810K00281310409", "due_dates_position": "start_of_month" } }, @@ -139,6 +151,7 @@ "identifier": "L3", "sap_material_code": "20002007", "sap_order_item_number": "2813104104", + "sap_project_number": "2810K00281310410", "due_dates_position": "start_of_month" } }, @@ -150,6 +163,7 @@ "identifier": "O2", "sap_material_code": "20002009", "sap_order_item_number": "2813104105", + "sap_project_number": "2810K00281310411", "due_dates_position": "start_of_month" } }, @@ -161,6 +175,7 @@ "identifier": "O3", "sap_material_code": "20002009", "sap_order_item_number": "2813102006", + "sap_project_number": "2810K00281310206", "due_dates_position": "start_of_month" } }, @@ -172,6 +187,7 @@ "identifier": "O4", "sap_material_code": "20002009", "sap_order_item_number": "2813104105", + "sap_project_number": "2810K00281310411", "due_dates_position": "start_of_month" } }, @@ -183,6 +199,7 @@ "identifier": "K0", "sap_material_code": "20002009", "sap_order_item_number": "2813100001", + "sap_project_number": "2810K00281310001", "due_dates_position": "start_of_month" } }, @@ -194,6 +211,7 @@ "identifier": "V5", "sap_material_code": "20002009", "sap_order_item_number": "2813100002", + "sap_project_number": null, "due_dates_position": "start_of_month" } }, @@ -205,6 +223,7 @@ "identifier": "V2", "sap_material_code": "20002009", "sap_order_item_number": "2813100002", + "sap_project_number": "2810K00281310002", "due_dates_position": "start_of_month" } }, @@ -215,7 +234,8 @@ "name": "Helsingin Vesi", "identifier": "V6", "sap_material_code": "20002009", - "sap_order_item_number": "", + "sap_order_item_number": null, + "sap_project_number": null, "due_dates_position": "start_of_month" } }, @@ -227,6 +247,7 @@ "identifier": "V4", "sap_material_code": "20002009", "sap_order_item_number": "2813100002", + "sap_project_number": "2810K00281310002", "due_dates_position": "start_of_month" } }, @@ -238,6 +259,7 @@ "identifier": "V1", "sap_material_code": "20002009", "sap_order_item_number": "2813100002", + "sap_project_number": "2810K00281310002", "due_dates_position": "start_of_month" } }, @@ -249,6 +271,7 @@ "identifier": "V3", "sap_material_code": "20002009", "sap_order_item_number": "2813100002", + "sap_project_number": "2810K00281310002", "due_dates_position": "start_of_month" } }, @@ -260,6 +283,7 @@ "identifier": "Y3", "sap_material_code": "20002009", "sap_order_item_number": "2813100003", + "sap_project_number": "2810K00281310003", "due_dates_position": "start_of_month" } }, @@ -271,6 +295,7 @@ "identifier": "Y5", "sap_material_code": "20002009", "sap_order_item_number": "2813100003", + "sap_project_number": "2810K00281310003", "due_dates_position": "start_of_month" } }, @@ -282,6 +307,7 @@ "identifier": "Y6", "sap_material_code": "20002009", "sap_order_item_number": "2813100003", + "sap_project_number": "2810K00281310003", "due_dates_position": "start_of_month" } }, @@ -293,6 +319,7 @@ "identifier": "Y7", "sap_material_code": "20002009", "sap_order_item_number": "2813100003", + "sap_project_number": "2810K00281310003", "due_dates_position": "start_of_month" } }, @@ -304,6 +331,7 @@ "identifier": "Y2", "sap_material_code": "20002009", "sap_order_item_number": "2813100003", + "sap_project_number": "2810K00281310003", "due_dates_position": "start_of_month" } }, @@ -315,6 +343,7 @@ "identifier": "Y4", "sap_material_code": "20002009", "sap_order_item_number": "2813100003", + "sap_project_number": "2810K00281310003", "due_dates_position": "start_of_month" } }, @@ -326,6 +355,7 @@ "identifier": "Y1", "sap_material_code": "20002009", "sap_order_item_number": "2813100003", + "sap_project_number": "2810K00281310003", "due_dates_position": "start_of_month" } }, @@ -337,6 +367,7 @@ "identifier": "Y8", "sap_material_code": "20002009", "sap_order_item_number": "2813100003", + "sap_project_number": "2810K00281310003", "due_dates_position": "start_of_month" } }, @@ -348,6 +379,7 @@ "identifier": "TY", "sap_material_code": "", "sap_order_item_number": "", + "sap_project_number": null, "due_dates_position": "start_of_month" } }, @@ -359,6 +391,7 @@ "identifier": "MA", "sap_material_code": "", "sap_order_item_number": "", + "sap_project_number": null, "due_dates_position": "start_of_month" } }, @@ -370,6 +403,7 @@ "identifier": "Y9", "sap_material_code": "20002009", "sap_order_item_number": "2813100003", + "sap_project_number": "2810K00281310003", "due_dates_position": "start_of_month" } }, @@ -381,6 +415,7 @@ "identifier": "MY", "sap_material_code": "", "sap_order_item_number": "", + "sap_project_number": null, "due_dates_position": "start_of_month" } }, @@ -390,8 +425,9 @@ "fields": { "name": "SIIRTOLAPUUTARHA ei käytössä", "identifier": "R0", - "sap_material_code": "", - "sap_order_item_number": "", + "sap_material_code": null, + "sap_order_item_number": null, + "sap_project_number": null, "due_dates_position": "start_of_month" } }, @@ -401,8 +437,9 @@ "fields": { "name": "Väestönsuojakorvaukset", "identifier": "VS", - "sap_material_code": "", - "sap_order_item_number": "", + "sap_material_code": null, + "sap_order_item_number": null, + "sap_project_number": null, "due_dates_position": "start_of_month" } }, @@ -414,6 +451,7 @@ "identifier": "Y0", "sap_material_code": "20002009", "sap_order_item_number": "2813100003", + "sap_project_number": "2810K00281310003", "due_dates_position": "start_of_month" } }, @@ -425,6 +463,7 @@ "identifier": "T3", "sap_material_code": "10003610", "sap_order_item_number": "2813104100", + "sap_project_number": "2810K00281310406", "due_dates_position": "start_of_month" } }, @@ -434,8 +473,9 @@ "fields": { "name": "Liikuntaviraston ulosvuokraus", "identifier": "S1", - "sap_material_code": "", - "sap_order_item_number": "", + "sap_material_code": null, + "sap_order_item_number": null, + "sap_project_number": null, "due_dates_position": "start_of_month" } }