Merge branch 'feature-716-item-code-updates' of github.com:OpenUpSA/m…

…unicipal-data into staging

municipal_finance/fixtures/initial/cash_flow_items_v2.csv

@@ -1,33 +1,33 @@
-code,label,position_in_return_form,return_form_structure,composition,version
-0100,Receipts,1,line_item,,1
-0120,Property rates,2,line_item,,1
-0130,Service charges,3,line_item,,1
-0140,Other revenue,4,line_item,,1
-0150,Government - operating,5,line_item,,1
-0160,Government - capital,6,line_item,,1
-0170,Interest,7,line_item,,1
-0180,Dividends,8,line_item,,1
-0190,Payments,9,line_item,,1
-0200,Suppliers and employees,10,line_item,,1
-0210,Finance charges,11,line_item,,1
-0220,Transfers and Grants,12,line_item,,1
-0230,NET CASH FROM/(USED) OPERATING ACTIVITIES,13,line_item,,1
-0240,CASH FLOWS FROM INVESTING ACTIVITIES,14,line_item,,1
-0250,Receipts,15,line_item,,1
-0260,Proceeds on disposal of PPE,16,line_item,,1
-0280,Decrease (increase) in non-current receivables,17,line_item,,1
-0290,Decrease (increase) in non-current investments,18,line_item,,1
-0300,Payments,19,line_item,,1
-0310,Capital assets,20,line_item,,1
-0320,NET CASH FROM/(USED) INVESTING ACTIVITIES,21,line_item,,1
-0330,CASH FLOWS FROM FINANCING ACTIVITIES,22,line_item,,1
-0340,Receipts,23,line_item,,1
-0350,Short term loans,24,line_item,,1
-0360,Borrowing long term/refinancing,25,line_item,,1
-0370,Increase (decrease) in consumer deposits,26,line_item,,1
-0380,Payments,27,line_item,,1
-0390,Repayment of borrowing,28,line_item,,1
-0400,NET CASH FROM/(USED) FINANCING ACTIVITIES,29,line_item,,1
-0410,NET INCREASE/ (DECREASE) IN CASH HELD,30,line_item,,1
-0420,Cash/cash equivalents at the year begin:,31,line_item,,1
-0430,Cash/cash equivalents at the year end:,32,line_item,,1
+code,label,position_in_return_form,return_form_structure,composition
+0100,Receipts,1,line_item,
+0120,Property rates,2,line_item,
+0130,Service charges,3,line_item,
+0140,Other revenue,4,line_item,
+0150,Government - operating,5,line_item,
+0160,Government - capital,6,line_item,
+0170,Interest,7,line_item,
+0180,Dividends,8,line_item,
+0190,Payments,9,line_item,
+0200,Suppliers and employees,10,line_item,
+0210,Finance charges,11,line_item,
+0220,Transfers and Grants,12,line_item,
+0230,NET CASH FROM/(USED) OPERATING ACTIVITIES,13,line_item,
+0240,CASH FLOWS FROM INVESTING ACTIVITIES,14,line_item,
+0250,Receipts,15,line_item,
+0260,Proceeds on disposal of PPE,16,line_item,
+0280,Decrease (increase) in non-current receivables,17,line_item,
+0290,Decrease (increase) in non-current investments,18,line_item,
+0300,Payments,19,line_item,
+0310,Capital assets,20,line_item,
+0320,NET CASH FROM/(USED) INVESTING ACTIVITIES,21,line_item,
+0330,CASH FLOWS FROM FINANCING ACTIVITIES,22,line_item,
+0340,Receipts,23,line_item,
+0350,Short term loans,24,line_item,
+0360,Borrowing long term/refinancing,25,line_item,
+0370,Increase (decrease) in consumer deposits,26,line_item,
+0380,Payments,27,line_item,
+0390,Repayment of borrowing,28,line_item,
+0400,NET CASH FROM/(USED) FINANCING ACTIVITIES,29,line_item,
+0410,NET INCREASE/ (DECREASE) IN CASH HELD,30,line_item,
+0420,Cash/cash equivalents at the year begin:,31,line_item,
+0430,Cash/cash equivalents at the year end:,32,line_item,

municipal_finance/migrations/0046_auto_20231114_0015.py

@@ -25,4 +25,9 @@ class Migration(migrations.Migration):
                 'db_table': 'item_code_schema',
             },
         ),
+        migrations.AlterField(
+            model_name='conditionalgranttypesv1',
+            name='code',
+            field=models.TextField(primary_key=True, serialize=False),
+        ),
     ]

municipal_finance/migrations/0047_auto_20231129_1312.py

@@ -94,9 +94,4 @@ class Migration(migrations.Migration):
             'financial_position_items_v2.csv',
         ),
         run_data_import(CapitalItemsV2Resource, 'capital_items_v2.csv'),
-        migrations.AlterField(
-            model_name='conditionalgranttypesv1',
-            name='code',
-            field=models.TextField(primary_key=True, serialize=False),
-        ),
     ]