credativ team mailing list archive

["Dmitrijs Ledkovs \(credativ\)" <dmitrijs.ledkovs@xxxxxxxxxxxxxx>]

Dmitrijs Ledkovs (credativ) has proposed merging lp:~credativ/l10n-openerp-uk/credativ-upstream-changes into lp:l10n-openerp-uk.

Requested reviews:
  UK OpenERP Alliance (uk-openerp-alliance)

For more details, see:
https://code.launchpad.net/~credativ/l10n-openerp-uk/credativ-upstream-changes/+merge/83173

Here is a list of patches:

21: Dmitrijs Ledkovs 2011-11-23 [IMP] add missing rates, remove python calculations
20: Dmitrijs Ledkovs 2011-11-23 [IMP] More tax codes for detailed VAT report
19: Dmitrijs Ledkovs 2011-11-23 [FIX] Changes, improvements and corrections to chart of accounts
18: Dmitrijs Ledkovs 2011-11-23 [FIX] Add id column to states, otherwise they are not imported
17: Dmitrijs Ledkovs 2011-11-23 [IMP] Add fiscal positions

Please read the details changes & justifications in the commit messages.

Thank for this new chart of accounts it is a better base than stock uk chart of account offerings.

If you have any questions, objections or request. Please let me know I'll try to help as much as possible.
-- 
https://code.launchpad.net/~credativ/l10n-openerp-uk/credativ-upstream-changes/+merge/83173
Your team credativ is subscribed to branch lp:~credativ/l10n-openerp-uk/credativ-upstream-changes.

=== modified file 'l10n_openerp_uk/__openerp__.py'
--- l10n_openerp_uk/__openerp__.py	2011-03-24 09:15:06 +0000
+++ l10n_openerp_uk/__openerp__.py	2011-11-23 15:13:36 +0000
@@ -38,6 +38,8 @@
         'data/account.tax.code.template.csv',
         'data/account.chart.template.csv',
         'data/account.tax.template.csv',
+        'data/account.fiscal.position.template.csv',
+        'data/account.fiscal.position.tax.template.csv',
         'l10n_uk_wizard.xml',
         'data/res.country.state.csv'
     ],

=== modified file 'l10n_openerp_uk/data/account.account.template.csv'
--- l10n_openerp_uk/data/account.account.template.csv	2011-03-24 09:15:06 +0000
+++ l10n_openerp_uk/data/account.account.template.csv	2011-11-23 15:13:36 +0000
@@ -1,161 +1,161 @@
-"id","code","name","parent_id:id","type","user_type:id","reconcile"
-0,0,"Company",,"view","account_type_view","FALSE"
-"BAL","BAL","Balance Sheet",0,"view","account_type_view","FALSE"
-"P&L","P&L","Profit and Loss",0,"view","account_type_view","FALSE"
-"000a","000a","Fixed Assets","BAL","view","account_type_view","FALSE"
-"000b","000b","Current Assets","BAL","view","account_type_view","FALSE"
-"000c","000c","Current Liabilities","BAL","view","account_type_view","FALSE"
-"000d","000d","Long Term Liabilities","BAL","view","account_type_view","FALSE"
-"000e","000e","Capital & Reserves","BAL","view","account_type_view","FALSE"
-"000f","000f","Sales","P&L","view","account_type_view","FALSE"
-"000g","000g","Purchases","P&L","view","account_type_view","FALSE"
-"000h","000h","Direct Expenses","P&L","view","account_type_view","FALSE"
-"000i","000i","Overheads","P&L","view","account_type_view","FALSE"
-0010,0010,"Freehold Property","000a","other","account_type_fixed_assets","FALSE"
-0011,0011,"Leasehold Property","000a","other","account_type_fixed_assets","FALSE"
-0020,0020,"Plant and Machinery","000a","other","account_type_fixed_assets","FALSE"
-0021,0021,"Plant/Machinery Depreciation","000a","other","account_type_fixed_assets","FALSE"
-0030,0030,"Office Equipment","000a","other","account_type_fixed_assets","FALSE"
-0031,0031,"Office Equipment Depreciation","000a","other","account_type_fixed_assets","FALSE"
-0040,0040,"Furniture and Fixtures","000a","other","account_type_fixed_assets","FALSE"
-0041,0041,"Furniture/Fixture Depreciation","000a","other","account_type_fixed_assets","FALSE"
-0050,0050,"Motor Vehicles","000a","other","account_type_fixed_assets","FALSE"
-0051,0051,"Motor Vehicles Depreciation","000a","other","account_type_fixed_assets","FALSE"
-1001,1001,"Stock","000b","other","account_type_current_assets","FALSE"
-1002,1002,"Work in Progress","000b","other","account_type_current_assets","FALSE"
-1003,1003,"Finished Goods","000b","other","account_type_current_assets","FALSE"
-1100,1100,"Debtors Control Account","000b","receivable","account_type_receivable","TRUE"
-1101,1101,"Sundry Debtors","000b","other","account_type_current_assets","TRUE"
-1102,1102,"Other Debtors","000b","other","account_type_current_assets","TRUE"
-1103,1103,"Prepayments","000b","other","account_type_current_assets","TRUE"
-1200,1200,"Bank Current Account","000b","liquidity","account_type_current_assets","TRUE"
-1210,1210,"Bank Deposit Account","000b","liquidity","account_type_current_assets","TRUE"
-1220,1220,"Building Society Account","000b","liquidity","account_type_current_assets","TRUE"
-1230,1230,"Petty Cash","000b","other","account_type_current_assets","TRUE"
-1240,1240,"Company Credit Card","000c","other","account_type_current_liabilities","TRUE"
-2100,2100,"Creditors Control Account","000c","payable","account_type_payable","TRUE"
-2101,2101,"Sundry Creditors","000c","other","account_type_current_liabilities","TRUE"
-2102,2102,"Other Creditors","000c","other","account_type_current_liabilities","TRUE"
-2109,2109,"Accruals","000c","other","account_type_current_liabilities","TRUE"
-2200,2200,"Sales Tax Control Account","000c","other","account_type_output_tax","FALSE"
-2201,2201,"Purchase Tax Control Account","000c","other","account_type_input_tax","FALSE"
-2202,2202,"VAT Liability","000c","payable","account_type_payable","TRUE"
-2204,2204,"Manual Adjustments","000c","other","account_type_current_liabilities","FALSE"
-2210,2210,"P.A.Y.E.","000c","payable","account_type_payable","TRUE"
-2211,2211,"National Insurance","000c","other","account_type_current_liabilities","FALSE"
-2220,2220,"Net Wages","000c","payable","account_type_payable","TRUE"
-2230,2230,"Pension Fund","000c","other","account_type_current_liabilities","FALSE"
-2300,2300,"Loans","000d","other","account_type_current_liabilities","FALSE"
-2310,2310,"Hire Purchase","000d","other","account_type_current_liabilities","FALSE"
-2320,2320,"Corporation Tax","000d","other","account_type_current_liabilities","FALSE"
-2330,2330,"Mortgages","000d","other","account_type_current_liabilities","FALSE"
-3100,3100,"Reserves","000e","other","account_type_equity","FALSE"
-3010,3010,"Preference Shares","000e","other","account_type_equity","FALSE"
-3101,3101,"Undistributed Reserves","000e","other","account_type_equity","FALSE"
-3200,3200,"Profit and Loss Account","000e","other","account_type_profit_and_loss","FALSE"
-3201,3201,"Drawings","000e","other","account_type_equity","FALSE"
-4000,4000,"Sales North","000f","other","account_type_income","FALSE"
-4001,4001,"Sales South","000f","other","account_type_income","FALSE"
-4002,4002,"Sales Scotland","000f","other","account_type_income","FALSE"
-4003,4003,"Sales Wales","000f","other","account_type_income","FALSE"
-4004,4004,"Sales International","000f","other","account_type_income","FALSE"
-4009,4009,"Discounts Allowed","000f","other","account_type_income","FALSE"
-4100,4100,"Sales Export","000f","other","account_type_income","FALSE"
-4200,4200,"Sales of Assets","000f","other","account_type_income","FALSE"
-4400,4400,"Credit Charges","000f","other","account_type_income","FALSE"
-4900,4900,"Miscellaneous Income","000f","other","account_type_income","FALSE"
-4901,4901,"Royalties Received","000f","other","account_type_income","FALSE"
-4902,4902,"Commissions Received","000f","other","account_type_income","FALSE"
-4903,4903,"Insurance Claims","000f","other","account_type_income","FALSE"
-4905,4905,"Distribution and Carriage","000f","other","account_type_income","FALSE"
-5000,5000,"Materials Purchased","000g","other","account_type_expense","FALSE"
-5001,5001,"Materials Imported","000g","other","account_type_expense","FALSE"
-5002,5002,"Miscellaneous Purchases","000g","other","account_type_expense","FALSE"
-5003,5003,"Packaging","000g","other","account_type_expense","FALSE"
-5009,5009,"Discounts Taken","000g","other","account_type_expense","FALSE"
-5100,5100,"Carriage","000g","other","account_type_expense","FALSE"
-5101,5101,"Import Duty","000g","other","account_type_expense","FALSE"
-5102,5102,"Transport Insurance","000g","other","account_type_expense","FALSE"
-5200,5200,"Opening Stock","000g","other","account_type_expense","FALSE"
-5201,5201,"Closing Stock","000g","other","account_type_expense","FALSE"
-6000,6000,"Productive Labour","000h","other","account_type_expense","FALSE"
-6001,6001,"Cost of Sales Labour","000h","other","account_type_expense","FALSE"
-6002,6002,"Sub-Contractors","000h","other","account_type_expense","FALSE"
-6100,6100,"Sales Commissions","000h","other","account_type_expense","FALSE"
-6200,6200,"Sales Promotions","000h","other","account_type_expense","FALSE"
-6201,6201,"Advertising","000h","other","account_type_expense","FALSE"
-6202,6202,"Gifts and Samples","000h","other","account_type_expense","FALSE"
-6203,6203,"P.R. (Literature & Brochures)","000h","other","account_type_expense","FALSE"
-6900,6900,"Miscellaneous Expenses","000h","other","account_type_expense","FALSE"
-7000,7000,"Gross Wages","000i","other","account_type_expense","FALSE"
-7001,7001,"Directors Salaries","000i","other","account_type_expense","FALSE"
-7002,7002,"Directors Remuneration","000i","other","account_type_expense","FALSE"
-7003,7003,"Staff Salaries","000i","other","account_type_expense","FALSE"
-7004,7004,"Wages - Regular","000i","other","account_type_expense","FALSE"
-7005,7005,"Wages - Casual","000i","other","account_type_expense","FALSE"
-7006,7006,"Employers N.I.","000i","other","account_type_expense","FALSE"
-7007,7007,"Employers Pensions","000i","other","account_type_expense","FALSE"
-7008,7008,"Recruitment Expenses","000i","other","account_type_expense","FALSE"
-7009,7009,"Adjustments","000i","other","account_type_expense","FALSE"
-7010,7010,"SSP Reclaimed","000i","other","account_type_expense","FALSE"
-7011,7011,"SMP Reclaimed","000i","other","account_type_expense","FALSE"
-7100,7100,"Rent","000i","other","account_type_expense","FALSE"
-7102,7102,"Water Rates","000i","other","account_type_expense","FALSE"
-7103,7103,"General Rates","000i","other","account_type_expense","FALSE"
-7104,7104,"Premises Insurance","000i","other","account_type_expense","FALSE"
-7200,7200,"Electricity","000i","other","account_type_expense","FALSE"
-7201,7201,"Gas","000i","other","account_type_expense","FALSE"
-7202,7202,"Oil","000i","other","account_type_expense","FALSE"
-7203,7203,"Other Heating Costs","000i","other","account_type_expense","FALSE"
-7300,7300,"Fuel and Oil","000i","other","account_type_expense","FALSE"
-7301,7301,"Repairs and Servicing","000i","other","account_type_expense","FALSE"
-7302,7302,"Licences","000i","other","account_type_expense","FALSE"
-7303,7303,"Vehicle Insurance","000i","other","account_type_expense","FALSE"
-7304,7304,"Miscellaneous Motor Expenses","000i","other","account_type_expense","FALSE"
-7350,7350,"Scale Charges","000i","other","account_type_expense","FALSE"
-7400,7400,"Travelling","000i","other","account_type_expense","FALSE"
-7401,7401,"Car Hire","000i","other","account_type_expense","FALSE"
-7402,7402,"Hotels","000i","other","account_type_expense","FALSE"
-7403,7403,"U.K. Entertainment","000i","other","account_type_expense","FALSE"
-7404,7404,"Overseas Entertainment","000i","other","account_type_expense","FALSE"
-7405,7405,"Overseas Travelling","000i","other","account_type_expense","FALSE"
-7406,7406,"Subsistence","000i","other","account_type_expense","FALSE"
-7500,7500,"Printing","000i","other","account_type_expense","FALSE"
-7501,7501,"Postage and Carriage","000i","other","account_type_expense","FALSE"
-7502,7502,"Telephone","000i","other","account_type_expense","FALSE"
-7503,7503,"Telex/Telegram/Facsimile","000i","other","account_type_expense","FALSE"
-7504,7504,"Office Stationery","000i","other","account_type_expense","FALSE"
-7505,7505,"Books etc.","000i","other","account_type_expense","FALSE"
-7600,7600,"Legal Fees","000i","other","account_type_expense","FALSE"
-7601,7601,"Audit and Accountancy Fees","000i","other","account_type_expense","FALSE"
-7602,7602,"Consultancy Fees","000i","other","account_type_expense","FALSE"
-7603,7603,"Professional Fees","000i","other","account_type_expense","FALSE"
-7700,7700,"Equipment Hire","000i","other","account_type_expense","FALSE"
-7701,7701,"Office Machine Maintenance","000i","other","account_type_expense","FALSE"
-7800,7800,"Repairs and Renewals","000i","other","account_type_expense","FALSE"
-7801,7801,"Cleaning","000i","other","account_type_expense","FALSE"
-7802,7802,"Laundry","000i","other","account_type_expense","FALSE"
-7803,7803,"Premises Expenses","000i","other","account_type_expense","FALSE"
-7900,7900,"Bank Interest Paid","000i","other","account_type_expense","FALSE"
-7901,7901,"Bank Charges","000i","other","account_type_expense","FALSE"
-7902,7902,"Currency Charges","000i","other","account_type_expense","FALSE"
-7903,7903,"Loan Interest Paid","000i","other","account_type_expense","FALSE"
-7904,7904,"H.P. Interest","000i","other","account_type_expense","FALSE"
-7905,7905,"Credit Charges","000i","other","account_type_expense","FALSE"
-7906,7906,"Exchange Rate Variance","000i","other","account_type_expense","FALSE"
-8000,8000,"Depreciation","000i","other","account_type_expense","FALSE"
-8001,8001,"Plant/Machinery Depreciation","000i","other","account_type_expense","FALSE"
-8002,8002,"Furniture/Fitting Depreciation","000i","other","account_type_expense","FALSE"
-8003,8003,"Vehicle Depreciation","000i","other","account_type_expense","FALSE"
-8004,8004,"Office Equipment Depreciation","000i","other","account_type_expense","FALSE"
-8100,8100,"Bad Debt Write Off","000i","other","account_type_expense","FALSE"
-8102,8102,"Bad Debt Provision","000i","other","account_type_expense","FALSE"
-8200,8200,"Donations","000i","other","account_type_expense","FALSE"
-8201,8201,"Subscriptions","000i","other","account_type_expense","FALSE"
-8202,8202,"Clothing Costs","000i","other","account_type_expense","FALSE"
-8203,8203,"Training Costs","000i","other","account_type_expense","FALSE"
-8204,8204,"Insurance","000i","other","account_type_expense","FALSE"
-8205,8205,"Refreshments","000i","other","account_type_expense","FALSE"
-8222,8222,"Bank Interest Received","000i","other","account_type_expense","FALSE"
-9998,9998,"Suspense Account","000i","other","account_type_expense","FALSE"
-9999,9999,"Mispostings Account","000i","other","account_type_expense","FALSE"
+"id","code","name","parent_id:id","type","user_type:id","reconcile"
+0,0,"Company",,"view","account_type_view","FALSE"
+"BAL","BAL","Balance Sheet",0,"view","account_type_view","FALSE"
+"P&L","P&L","Profit and Loss",0,"view","account_type_view","FALSE"
+"000a","000a","Fixed Assets","BAL","view","account_type_view","FALSE"
+"000b","000b","Current Assets","BAL","view","account_type_view","FALSE"
+"000c","000c","Current Liabilities","BAL","view","account_type_view","FALSE"
+"000d","000d","Long Term Liabilities","BAL","view","account_type_view","FALSE"
+"000e","000e","Capital & Reserves","BAL","view","account_type_view","FALSE"
+"000f","000f","Sales","P&L","view","account_type_view","FALSE"
+"000g","000g","Purchases","P&L","view","account_type_view","FALSE"
+"000h","000h","Direct Expenses","P&L","view","account_type_view","FALSE"
+"000i","000i","Overheads","P&L","view","account_type_view","FALSE"
+"0010","0010","Freehold Property","000a","other","account_type_fixed_assets","FALSE"
+"0011","0011","Leasehold Property","000a","other","account_type_fixed_assets","FALSE"
+"0020","0020","Plant and Machinery","000a","other","account_type_fixed_assets","FALSE"
+"0021","0021","Plant/Machinery Depreciation","000a","other","account_type_fixed_assets","FALSE"
+"0030","0030","Office Equipment","000a","other","account_type_fixed_assets","FALSE"
+"0031","0031","Office Equipment Depreciation","000a","other","account_type_fixed_assets","FALSE"
+"0040","0040","Furniture and Fixtures","000a","other","account_type_fixed_assets","FALSE"
+"0041","0041","Furniture/Fixture Depreciation","000a","other","account_type_fixed_assets","FALSE"
+"0050","0050","Motor Vehicles","000a","other","account_type_fixed_assets","FALSE"
+"0051","0051","Motor Vehicles Depreciation","000a","other","account_type_fixed_assets","FALSE"
+1001,1001,"Stock","000b","other","account_type_current_assets","FALSE"
+1002,1002,"Work in Progress","000b","other","account_type_current_assets","FALSE"
+1003,1003,"Finished Goods","000b","other","account_type_current_assets","FALSE"
+1100,1100,"Debtors Control Account","000b","receivable","account_type_receivable","TRUE"
+1101,1101,"Sundry Debtors","000b","receivable","account_type_receivable","TRUE"
+1102,1102,"Other Debtors","000b","receivable","account_type_receivable","TRUE"
+1103,1103,"Prepayments","000b","other","account_type_current_liabilities","TRUE"
+1200,1200,"Bank Current Account","000b","liquidity","account_type_current_assets","FALSE"
+1210,1210,"Bank Deposit Account","000b","liquidity","account_type_current_assets","FALSE"
+1220,1220,"Building Society Account","000b","liquidity","account_type_current_assets","FALSE"
+1230,1230,"Petty Cash","000b","other","account_type_current_assets","FALSE"
+1240,1240,"Company Credit Card","000c","other","account_type_current_liabilities","FALSE"
+2100,2100,"Creditors Control Account","000c","payable","account_type_payable","TRUE"
+2101,2101,"Sundry Creditors","000c","payable","account_type_payable","TRUE"
+2102,2102,"Other Creditors","000c","payable","account_type_payable","TRUE"
+2109,2109,"Accruals","000c","other","account_type_current_assets","TRUE"
+2200,2200,"Sales Tax Control Account","000c","other","account_type_output_tax","FALSE"
+2201,2201,"Purchase Tax Control Account","000c","other","account_type_input_tax","FALSE"
+2202,2202,"VAT Liability","000c","payable","account_type_payable","FALSE"
+2204,2204,"Manual Adjustments","000c","other","account_type_current_liabilities","FALSE"
+2210,2210,"P.A.Y.E.","000c","payable","account_type_payable","FALSE"
+2211,2211,"National Insurance","000c","other","account_type_current_liabilities","FALSE"
+2220,2220,"Net Wages","000c","payable","account_type_payable","FALSE"
+2230,2230,"Pension Fund","000c","other","account_type_current_liabilities","FALSE"
+2300,2300,"Loans","000d","other","account_type_current_liabilities","FALSE"
+2310,2310,"Hire Purchase","000d","other","account_type_current_liabilities","FALSE"
+2320,2320,"Corporation Tax","000d","other","account_type_current_liabilities","FALSE"
+2330,2330,"Mortgages","000d","other","account_type_current_liabilities","FALSE"
+3100,3100,"Reserves","000e","other","account_type_equity","FALSE"
+3010,3010,"Preference Shares","000e","other","account_type_equity","FALSE"
+3101,3101,"Undistributed Reserves","000e","other","account_type_equity","FALSE"
+3200,3200,"Profit and Loss Account","000e","other","account_type_profit_and_loss","FALSE"
+3201,3201,"Drawings","000e","other","account_type_equity","FALSE"
+4000,4000,"Sales North","000f","other","account_type_income","FALSE"
+4001,4001,"Sales South","000f","other","account_type_income","FALSE"
+4002,4002,"Sales Scotland","000f","other","account_type_income","FALSE"
+4003,4003,"Sales Wales","000f","other","account_type_income","FALSE"
+4004,4004,"Sales International","000f","other","account_type_income","FALSE"
+4009,4009,"Discounts Allowed","000f","other","account_type_income","FALSE"
+4100,4100,"Sales Export","000f","other","account_type_income","FALSE"
+4200,4200,"Sales of Assets","000f","other","account_type_income","FALSE"
+4400,4400,"Credit Charges","000f","other","account_type_income","FALSE"
+4900,4900,"Miscellaneous Income","000f","other","account_type_income","FALSE"
+4901,4901,"Royalties Received","000f","other","account_type_income","FALSE"
+4902,4902,"Commissions Received","000f","other","account_type_income","FALSE"
+4903,4903,"Insurance Claims","000f","other","account_type_income","FALSE"
+4905,4905,"Distribution and Carriage","000f","other","account_type_income","FALSE"
+5000,5000,"Materials Purchased","000g","other","account_type_expense","FALSE"
+5001,5001,"Materials Imported","000g","other","account_type_expense","FALSE"
+5002,5002,"Miscellaneous Purchases","000g","other","account_type_expense","FALSE"
+5003,5003,"Packaging","000g","other","account_type_expense","FALSE"
+5009,5009,"Discounts Taken","000g","other","account_type_expense","FALSE"
+5100,5100,"Carriage","000g","other","account_type_expense","FALSE"
+5101,5101,"Import Duty","000g","other","account_type_expense","FALSE"
+5102,5102,"Transport Insurance","000g","other","account_type_expense","FALSE"
+5200,5200,"Opening Stock","000g","other","account_type_expense","FALSE"
+5201,5201,"Closing Stock","000g","other","account_type_expense","FALSE"
+6000,6000,"Productive Labour","000h","other","account_type_expense","FALSE"
+6001,6001,"Cost of Sales Labour","000h","other","account_type_expense","FALSE"
+6002,6002,"Sub-Contractors","000h","other","account_type_expense","FALSE"
+6100,6100,"Sales Commissions","000h","other","account_type_expense","FALSE"
+6200,6200,"Sales Promotions","000h","other","account_type_expense","FALSE"
+6201,6201,"Advertising","000h","other","account_type_expense","FALSE"
+6202,6202,"Gifts and Samples","000h","other","account_type_expense","FALSE"
+6203,6203,"P.R. (Literature & Brochures)","000h","other","account_type_expense","FALSE"
+6900,6900,"Miscellaneous Expenses","000h","other","account_type_expense","FALSE"
+7000,7000,"Gross Wages","000i","other","account_type_expense","FALSE"
+7001,7001,"Directors Salaries","000i","other","account_type_expense","FALSE"
+7002,7002,"Directors Remuneration","000i","other","account_type_expense","FALSE"
+7003,7003,"Staff Salaries","000i","other","account_type_expense","FALSE"
+7004,7004,"Wages - Regular","000i","other","account_type_expense","FALSE"
+7005,7005,"Wages - Casual","000i","other","account_type_expense","FALSE"
+7006,7006,"Employers N.I.","000i","other","account_type_expense","FALSE"
+7007,7007,"Employers Pensions","000i","other","account_type_expense","FALSE"
+7008,7008,"Recruitment Expenses","000i","other","account_type_expense","FALSE"
+7009,7009,"Adjustments","000i","other","account_type_expense","FALSE"
+7010,7010,"SSP Reclaimed","000i","other","account_type_expense","FALSE"
+7011,7011,"SMP Reclaimed","000i","other","account_type_expense","FALSE"
+7100,7100,"Rent","000i","other","account_type_expense","FALSE"
+7102,7102,"Water Rates","000i","other","account_type_expense","FALSE"
+7103,7103,"General Rates","000i","other","account_type_expense","FALSE"
+7104,7104,"Premises Insurance","000i","other","account_type_expense","FALSE"
+7200,7200,"Electricity","000i","other","account_type_expense","FALSE"
+7201,7201,"Gas","000i","other","account_type_expense","FALSE"
+7202,7202,"Oil","000i","other","account_type_expense","FALSE"
+7203,7203,"Other Heating Costs","000i","other","account_type_expense","FALSE"
+7300,7300,"Fuel and Oil","000i","other","account_type_expense","FALSE"
+7301,7301,"Repairs and Servicing","000i","other","account_type_expense","FALSE"
+7302,7302,"Licences","000i","other","account_type_expense","FALSE"
+7303,7303,"Vehicle Insurance","000i","other","account_type_expense","FALSE"
+7304,7304,"Miscellaneous Motor Expenses","000i","other","account_type_expense","FALSE"
+7350,7350,"Scale Charges","000i","other","account_type_expense","FALSE"
+7400,7400,"Travelling","000i","other","account_type_expense","FALSE"
+7401,7401,"Car Hire","000i","other","account_type_expense","FALSE"
+7402,7402,"Hotels","000i","other","account_type_expense","FALSE"
+7403,7403,"U.K. Entertainment","000i","other","account_type_expense","FALSE"
+7404,7404,"Overseas Entertainment","000i","other","account_type_expense","FALSE"
+7405,7405,"Overseas Travelling","000i","other","account_type_expense","FALSE"
+7406,7406,"Subsistence","000i","other","account_type_expense","FALSE"
+7500,7500,"Printing","000i","other","account_type_expense","FALSE"
+7501,7501,"Postage and Carriage","000i","other","account_type_expense","FALSE"
+7502,7502,"Telephone","000i","other","account_type_expense","FALSE"
+7503,7503,"Telex/Telegram/Facsimile","000i","other","account_type_expense","FALSE"
+7504,7504,"Office Stationery","000i","other","account_type_expense","FALSE"
+7505,7505,"Books etc.","000i","other","account_type_expense","FALSE"
+7600,7600,"Legal Fees","000i","other","account_type_expense","FALSE"
+7601,7601,"Audit and Accountancy Fees","000i","other","account_type_expense","FALSE"
+7602,7602,"Consultancy Fees","000i","other","account_type_expense","FALSE"
+7603,7603,"Professional Fees","000i","other","account_type_expense","FALSE"
+7700,7700,"Equipment Hire","000i","other","account_type_expense","FALSE"
+7701,7701,"Office Machine Maintenance","000i","other","account_type_expense","FALSE"
+7800,7800,"Repairs and Renewals","000i","other","account_type_expense","FALSE"
+7801,7801,"Cleaning","000i","other","account_type_expense","FALSE"
+7802,7802,"Laundry","000i","other","account_type_expense","FALSE"
+7803,7803,"Premises Expenses","000i","other","account_type_expense","FALSE"
+7900,7900,"Bank Interest Paid","000i","other","account_type_expense","FALSE"
+7901,7901,"Bank Charges","000i","other","account_type_expense","FALSE"
+7902,7902,"Currency Charges","000i","other","account_type_expense","FALSE"
+7903,7903,"Loan Interest Paid","000i","other","account_type_expense","FALSE"
+7904,7904,"H.P. Interest","000i","other","account_type_expense","FALSE"
+7905,7905,"Credit Charges","000i","other","account_type_expense","FALSE"
+7906,7906,"Exchange Rate Variance","000i","other","account_type_expense","FALSE"
+8000,8000,"Depreciation","000i","other","account_type_expense","FALSE"
+8001,8001,"Plant/Machinery Depreciation","000i","other","account_type_expense","FALSE"
+8002,8002,"Furniture/Fitting Depreciation","000i","other","account_type_expense","FALSE"
+8003,8003,"Vehicle Depreciation","000i","other","account_type_expense","FALSE"
+8004,8004,"Office Equipment Depreciation","000i","other","account_type_expense","FALSE"
+8100,8100,"Bad Debt Write Off","000i","other","account_type_expense","FALSE"
+8102,8102,"Bad Debt Provision","000i","other","account_type_expense","FALSE"
+8200,8200,"Donations","000i","other","account_type_expense","FALSE"
+8201,8201,"Subscriptions","000i","other","account_type_expense","FALSE"
+8202,8202,"Clothing Costs","000i","other","account_type_expense","FALSE"
+8203,8203,"Training Costs","000i","other","account_type_expense","FALSE"
+8204,8204,"Insurance","000i","other","account_type_expense","FALSE"
+8205,8205,"Refreshments","000i","other","account_type_expense","FALSE"
+8222,8222,"Bank Interest Received","000i","other","account_type_expense","FALSE"
+9998,9998,"Suspense Account","000i","other","account_type_expense","FALSE"
+9999,9999,"Mispostings Account","000i","other","account_type_expense","FALSE"

=== added file 'l10n_openerp_uk/data/account.fiscal.position.tax.template.csv'
--- l10n_openerp_uk/data/account.fiscal.position.tax.template.csv	1970-01-01 00:00:00 +0000
+++ l10n_openerp_uk/data/account.fiscal.position.tax.template.csv	2011-11-23 15:13:36 +0000
@@ -0,0 +1,6 @@
+"id","position_id:id","tax_src_id:id","tax_dest_id:id"
+"fiscal_no_vat_pt","fiscal_no_vat","PT11","PT2"
+"fiscal_eu_vat_pt","fiscal_eu_vat","PT1","PT7"
+"fiscal_eu_vat_st","fiscal_eu_vat","ST11","ST4"
+"fiscal_world_pt","fiscal_world","PT11","PT9"
+"fiscal_world_pt","fiscal_world","ST11","ST9"

=== added file 'l10n_openerp_uk/data/account.fiscal.position.template.csv'
--- l10n_openerp_uk/data/account.fiscal.position.template.csv	1970-01-01 00:00:00 +0000
+++ l10n_openerp_uk/data/account.fiscal.position.template.csv	2011-11-23 15:13:36 +0000
@@ -0,0 +1,5 @@
+"id","name","chart_template_id:id"
+"fiscal_default","UK - VAT registered (no mappings needed)","l10n_chart_uk_sme"
+"fiscal_no_vat","UK - not VAT registered","l10n_chart_uk_sme"
+"fiscal_eu_vat","EU - VAT registered","l10n_chart_uk_sme"
+"fiscal_world","World - VAT Out of Scope","l10n_chart_uk_sme"

=== modified file 'l10n_openerp_uk/data/account.tax.code.template.csv'
--- l10n_openerp_uk/data/account.tax.code.template.csv	2011-03-24 09:15:06 +0000
+++ l10n_openerp_uk/data/account.tax.code.template.csv	2011-11-23 15:13:36 +0000
@@ -1,10 +1,24 @@
 "id","name","code","parent_id:id","notprintable","sign"
-0,"UK HMRC VAT",0,,,1
-4,"Net VAT to be paid/reclaimed",5,0,"FALSE",1
-5,"Total value of sales ex VAT (box 8 included)",6,0,"FALSE",0
-6,"Total value of purchases ex VAT",7,0,"FALSE",0
-8,"Total value of EC purchases, ex VAT",9,0,"FALSE",0
-1,"VAT on Sales and other outputs",1,4,"FALSE",1
-2,"VAT on acquisitions from other EC Member states",2,4,"FALSE",1
-3,"VAT reclaimed on purchases (EC included)",4,4,"FALSE",-1
-7,"Total value of EC sales, ex VAT",8,5,"FALSE",1
+0,"UK HMRC VAT",0,,"TRUE",1
+5,"VAT Balance to Pay (Box 5)",5,0,"TRUE",1
+1,"Output VAT (Box 1)",1,5,"TRUE",1
+101,"Output VAT Standard Rate","OVATS",1,"FALSE",1
+102,"Output VAT Reduced Rate","OVATR",1,"FALSE",1
+4,"Input VAT (Box 4)",4,5,"TRUE",-1
+401,"Input VAT Standard Rate","IVATS",4,"FALSE",1
+402,"Input VAT Reduced Rate","IVATR",4,"FALSE",1
+"base","Tax Bases",,0,"TRUE",1
+6,"Base of Taxable Sales (Box 6)",6,"base","TRUE",1
+601,"Taxable Sales Standard Rate",,6,"FALSE",1
+602,"Taxable Sales Reduced Rate",,6,"FALSE",1
+603,"Taxable Sales Zero Rate",,6,"FALSE",1
+604,"Taxable Sales Type X (Exempt)",,6,"FALSE",1
+605,"Taxable Sales Type O (Out of scope)",,6,"FALSE",1
+8,"Total value of EC goods sales, ex VAT (Box 8)",8,6,"FALSE",1
+7,"Taxable Purchases Base (Box 7)",7,"base","TRUE",1
+701,"Taxable Purchases Standard Rate",,7,"FALSE",1
+702,"Taxable Purchases Reduced Rate",,7,"FALSE",1
+703,"Taxable Purchases Zero Rate",,7,"FALSE",1
+704,"Taxable Purchases Type X (Exempt)",,7,"FALSE",1
+705,"Taxable Purchases Type O (Out of scope)",,7,"FALSE",1
+9,"Total value of EC goods purchases, ex VAT",9,7,"FALSE",1

=== modified file 'l10n_openerp_uk/data/account.tax.template.csv'
--- l10n_openerp_uk/data/account.tax.template.csv	2011-03-24 09:15:06 +0000
+++ l10n_openerp_uk/data/account.tax.template.csv	2011-11-23 15:13:36 +0000
@@ -1,16 +1,19 @@
-"id","description","chart_template_id:id","type_tax_use","name","type","amount","account_collected_id:id","account_paid_id:id","base_code_id:id","tax_code_id:id","ref_base_code_id:id","ref_tax_code_id:id","ref_base_sign","ref_tax_sign","parent_id:id","python_compute"
-"ST0","ST0","l10n_chart_uk_sme","sale","Zero rated sales","percent",0,2200,2200,5,1,5,1,-1,-1,,
-"ST1","ST1","l10n_chart_uk_sme","sale","Standard rate sales (17.5%)","code",0.175,2200,2200,5,1,5,1,-1,-1,,"result = price_unit * 0.175"
-"ST2","ST2","l10n_chart_uk_sme","sale","Exempt sales","percent",0,2200,2200,5,1,5,1,-1,-1,,
-"PT0","PT0","l10n_chart_uk_sme","purchase","Zero rated purchases","percent",0,2201,2201,6,3,6,3,-1,-1,,
-"PT1","PT1","l10n_chart_uk_sme","purchase","Standard rate purchases (17.5%)","code",0.175,2201,2201,6,3,6,3,-1,-1,,"result = price_unit * 0.175"
-"PT2","PT2","l10n_chart_uk_sme","purchase","Exempt purchases","percent",0,2201,2201,6,3,6,3,-1,-1,,
-"PT8","PT8","l10n_chart_uk_sme","purchase","Standard rated purchases from EC","code",0,2201,2201,8,2,8,2,-1,-1,,"result = price_unit * 0.175"
-"PT8R","PT8R","l10n_chart_uk_sme","purchase","Reverse EC Purchase VAT","percent",-1,2201,2201,,3,3,,-1,-1,"PT8",
-"PT5","PT5","l10n_chart_uk_sme","purchase","Lower rate purchases (5%)","percent",0.05,2201,2201,6,3,6,3,-1,-1,,
-"ST4","ST4","l10n_chart_uk_sme","sale","Sales to customers in EC","percent",0,2200,2200,7,,7,,-1,-1,,
-"PT7","PT7","l10n_chart_uk_sme","purchase","Zero rated purchases from EC","percent",0,2201,2201,8,,8,,-1,-1,,
-"ST11","ST11","l10n_chart_uk_sme","sale","Standard rate sales (20%)","percent",0.2,2200,2200,5,1,5,1,-1,-1,,
-"PT11","PT11","l10n_chart_uk_sme","purchase","Standard rate purchases (20%)","percent",0.2,2201,2201,6,3,6,3,-1,-1,,
-"PT18","PT18","l10n_chart_uk_sme","purchase","Standard rated purchases from EC (20%)","code",0,2201,2201,8,2,8,2,-1,-1,,"result = price_unit * 0.2"
-"PT18R","PT18R","l10n_chart_uk_sme","purchase","Reverse EC Purchase VAT (20%)","percent",-1,2201,2201,,3,3,,-1,-1,"PT18",
\ No newline at end of file
+"id","description","chart_template_id:id","type_tax_use","name","type","amount","account_collected_id:id","account_paid_id:id","base_code_id:id","tax_code_id:id","ref_base_code_id:id","ref_tax_code_id:id","ref_base_sign","ref_tax_sign","parent_id:id"
+"ST0","ST0","l10n_chart_uk_sme","sale","Zero rated sales","percent",0,2200,2200,603,,603,,-1,-1,
+"ST1","ST1","l10n_chart_uk_sme","sale","Standard rate sales (17.5%)","percent",0.175,2200,2200,601,101,601,101,-1,-1,
+"ST2","ST2","l10n_chart_uk_sme","sale","Exempt sales","percent",0,2200,2200,604,,604,,-1,-1,
+"ST4","ST4","l10n_chart_uk_sme","sale","Sales of goods to EC (0%)","percent",0,2200,2200,8,,8,,-1,-1,
+"ST5","ST5","l10n_chart_uk_sme","sale","Lower rate sales (5%)","percent",0.05,2200,2200,602,102,602,102,-1,-1,
+"ST9","ST9","l10n_chart_uk_sme","sale","Out of scope sales","percent",0,2200,2200,605,,605,,-1,-1,
+"ST11","ST11","l10n_chart_uk_sme","sale","Standard rate sales (20%)","percent",0.2,2200,2200,601,101,601,101,-1,-1,
+"PT0","PT0","l10n_chart_uk_sme","purchase","Zero rated purchases","percent",0,2201,2201,703,,703,,-1,-1,
+"PT1","PT1","l10n_chart_uk_sme","purchase","Standard rate purchases (17.5%)","percent",0.175,2201,2201,701,401,701,401,-1,-1,
+"PT2","PT2","l10n_chart_uk_sme","purchase","Exempt purchases","percent",0,2201,2201,704,,704,,-1,-1,
+"PT5","PT5","l10n_chart_uk_sme","purchase","Lower rate purchases (5%)","percent",0.05,2201,2201,702,402,702,402,-1,-1,
+"PT7","PT7","l10n_chart_uk_sme","purchase","Goods purchases from EC (0%)","percent",0,2201,2201,9,,9,,-1,-1,
+"PT8","PT8","l10n_chart_uk_sme","purchase","Standard rated purchases from EC (17.5%)","percent",0.175,2201,2201,9,101,9,101,-1,-1,
+"PT8R","PT8R","l10n_chart_uk_sme","purchase","Reverse EC Purchase VAT (17.5%)","percent",-1,2201,2201,,101,,101,-1,-1,"PT8"
+"PT9","PT9","l10n_chart_uk_sme","purchase","Out of scope purchases","percent",0,2201,2201,705,,705,,-1,-1,
+"PT11","PT11","l10n_chart_uk_sme","purchase","Standard rate purchases (20%)","percent",0.2,2201,2201,701,401,701,401,-1,-1,
+"PT18","PT18","l10n_chart_uk_sme","purchase","Standard rate purchases from EC (20%)","percent",0.2,2201,2201,9,402,9,402,-1,-1,
+"PT18R","PT18R","l10n_chart_uk_sme","purchase","Reverse EC Purchase VAT (20%)","percent",-1,2201,2201,,402,,402,-1,-1,"PT18"

=== modified file 'l10n_openerp_uk/data/res.country.state.csv'
--- l10n_openerp_uk/data/res.country.state.csv	2011-03-24 09:15:06 +0000
+++ l10n_openerp_uk/data/res.country.state.csv	2011-11-23 15:13:36 +0000
@@ -1,152 +1,152 @@
-"country_id:id","name","code"
-"base.uk","Avon","AVN"
-"base.uk","Bedfordshire","BDF"
-"base.uk","Berkshire","BRK"
-"base.uk","Buckinghamshire","BKM"
-"base.uk","Cambridgeshire","CAM"
-"base.uk","Cheshire","CHS"
-"base.uk","Cleveland","CLV"
-"base.uk","Co. Durham","DUR"
-"base.uk","Cornwall","CON"
-"base.uk","Cumberland","CUL"
-"base.uk","Cumbria","CMA"
-"base.uk","Derbyshire","DBY"
-"base.uk","Devon","DEV"
-"base.uk","Dorset","DOR"
-"base.uk","East Riding of Yorkshire","ERY"
-"base.uk","East Sussex","SXE"
-"base.uk","Essex","ESS"
-"base.uk","Gloucestershire","GLS"
-"base.uk","Greater Manchester","GTM"
-"base.uk","Hampshire","HAM"
-"base.uk","Hereford and Worcester","HWR"
-"base.uk","Herefordshire","HEF"
-"base.uk","Hertfordshire","HRT"
-"base.uk","Humberside","HUM"
-"base.uk","Huntingdonshire","HUN"
-"base.uk","Isle of Wight","IOW"
-"base.uk","Kent","KEN"
-"base.uk","Lancashire","LAN"
-"base.uk","Leicestershire","LEI"
-"base.uk","Lincolnshire","LIN"
-"base.uk","Merseyside","MSY"
-"base.uk","Norfolk","NFK"
-"base.uk","North Riding of Yorkshire","NRY"
-"base.uk","North Yorkshire","NYK"
-"base.uk","Northamptonshire","NTH"
-"base.uk","Northumberland","NBL"
-"base.uk","Nottinghamshire","NTT"
-"base.uk","Oxfordshire","OXF"
-"base.uk","Rutland","RUT"
-"base.uk","Shropshire","SAL"
-"base.uk","Somerset","SOM"
-"base.uk","South Yorkshire","SYK"
-"base.uk","Staffordshire","STS"
-"base.uk","Suffolk","SFK"
-"base.uk","Surrey","SRY"
-"base.uk","Sussex","SSX"
-"base.uk","Tyne and Wear","TWR"
-"base.uk","Warwickshire","WAR"
-"base.uk","West Midlands","WMD"
-"base.uk","West Riding of Yorkshire","WRY"
-"base.uk","West Sussex","SXW"
-"base.uk","West Yorkshire","WYK"
-"base.uk","Westmorland","WES"
-"base.uk","Wiltshire","WIL"
-"base.uk","Worcestershire","WOR"
-"base.uk","Yorkshire","YKS"
-"base.ie","Co. Carlow","CAR"
-"base.ie","Co. Cavan","CAV"
-"base.ie","Co. Clare","CLA"
-"base.ie","Co. Cork","COR"
-"base.ie","Co. Donegal","DON"
-"base.ie","Co. Dublin","DUB"
-"base.ie","Co. Galway","GAL"
-"base.ie","Co. Kerry","KER"
-"base.ie","Co. Kildare","KID"
-"base.ie","Co. Kilkenny","KIK"
-"base.ie","Co. Laois","LEX"
-"base.ie","Co. Leitrim","LET"
-"base.ie","Co. Limerick","LIM"
-"base.ie","Co. Longford","LOG"
-"base.ie","Co. Louth","LOU"
-"base.ie","Co. Mayo","MAY"
-"base.ie","Co. Meath","MEA"
-"base.ie","Co. Monaghan","MOG"
-"base.ie","Co. Offaly","OFF"
-"base.ie","Co. Roscommon","ROS"
-"base.ie","Co. Sligo","SLI"
-"base.ie","Co. Tipperary","TIP"
-"base.ie","Co. Waterford","WAT"
-"base.ie","Co. Westmeath","WEM"
-"base.ie","Co. Wexford","WEX"
-"base.ie","Co. Wicklow","WIC"
-"base.uk","Co. Antrim","ANT"
-"base.uk","Co. Armagh","ARM"
-"base.uk","Co. Down","DOW"
-"base.uk","Co. Fermanagh","FER"
-"base.uk","Co. Londonderry","LDY"
-"base.uk","Co. Tyrone","TYR"
-"base.uk","Aberdeenshire","ABD"
-"base.uk","Angus","ANS"
-"base.uk","Argyllshire","ARL"
-"base.uk","Ayrshire","AYR"
-"base.uk","Banffshire","BAN"
-"base.uk","Berwickshire","BEW"
-"base.uk","Borders","BOR"
-"base.uk","Bute","BUT"
-"base.uk","Caithness","CAI"
-"base.uk","Central","CEN"
-"base.uk","Clackmannanshire","CLK"
-"base.uk","Dumfries and Galloway","DGY"
-"base.uk","Dumfries-shire","DFS"
-"base.uk","Dunbartonshire","DNB"
-"base.uk","East Lothian","ELN"
-"base.uk","Fife","FIF"
-"base.uk","Grampian","GMP"
-"base.uk","Highland","HLD"
-"base.uk","Inverness-shire","INV"
-"base.uk","Kincardineshire","KCD"
-"base.uk","Kinross-shire","KRS"
-"base.uk","Kirkcudbrightshire","KKD"
-"base.uk","Lanarkshire","LKS"
-"base.uk","Lothian","LTN"
-"base.uk","Midlothian","MLN"
-"base.uk","Morayshire","MOR"
-"base.uk","Nairn","NAI"
-"base.uk","Orkney","OKI"
-"base.uk","Peebles-shire","PEE"
-"base.uk","Perth","PER"
-"base.uk","Renfrewshire","RFW"
-"base.uk","Ross and Cromarty","ROC"
-"base.uk","Roxburghshire","ROX"
-"base.uk","Selkirkshire","SEL"
-"base.uk","Shetland","SHI"
-"base.uk","Stirlingshire","STI"
-"base.uk","Strathclyde","STD"
-"base.uk","Sutherland","SUT"
-"base.uk","Tayside","TAY"
-"base.uk","West Lothian","WLN"
-"base.uk","Western Isles","WIS"
-"base.uk","Wigtownshire","WIG"
-"base.uk","Anglesey","AGY"
-"base.uk","Breconshire","BRE"
-"base.uk","Caernarvonshire","CAE"
-"base.uk","Cardiganshire","CGN"
-"base.uk","Carmarthenshire","CMN"
-"base.uk","Clwyd","CWD"
-"base.uk","Denbighshire","DEN"
-"base.uk","Dyfed","DFD"
-"base.uk","Flintshire","FLN"
-"base.uk","Glamorgan","GLA"
-"base.uk","Gwent","GNT"
-"base.uk","Gwynedd","GWN"
-"base.uk","Merionethshire","MER"
-"base.uk","Mid Glamorgan","MGM"
-"base.uk","Monmouthshire","MON"
-"base.uk","Montgomeryshire","MGY"
-"base.uk","Pembrokeshire","PEM"
-"base.uk","Powys","POW"
-"base.uk","Radnorshire","RAD"
-"base.uk","South Glamorgan","SGM"
-"base.uk","West Glamorgan","WGM"
+"id","country_id:id","name","code"
+"AVN","base.uk","Avon","AVN"
+"BDF","base.uk","Bedfordshire","BDF"
+"BRK","base.uk","Berkshire","BRK"
+"BKM","base.uk","Buckinghamshire","BKM"
+"CAM","base.uk","Cambridgeshire","CAM"
+"CHS","base.uk","Cheshire","CHS"
+"CLV","base.uk","Cleveland","CLV"
+"DUR","base.uk","Co. Durham","DUR"
+"CON","base.uk","Cornwall","CON"
+"CUL","base.uk","Cumberland","CUL"
+"CMA","base.uk","Cumbria","CMA"
+"DBY","base.uk","Derbyshire","DBY"
+"DEV","base.uk","Devon","DEV"
+"DOR","base.uk","Dorset","DOR"
+"ERY","base.uk","East Riding of Yorkshire","ERY"
+"SXE","base.uk","East Sussex","SXE"
+"ESS","base.uk","Essex","ESS"
+"GLS","base.uk","Gloucestershire","GLS"
+"GTM","base.uk","Greater Manchester","GTM"
+"HAM","base.uk","Hampshire","HAM"
+"HWR","base.uk","Hereford and Worcester","HWR"
+"HEF","base.uk","Herefordshire","HEF"
+"HRT","base.uk","Hertfordshire","HRT"
+"HUM","base.uk","Humberside","HUM"
+"HUN","base.uk","Huntingdonshire","HUN"
+"IOW","base.uk","Isle of Wight","IOW"
+"KEN","base.uk","Kent","KEN"
+"LAN","base.uk","Lancashire","LAN"
+"LEI","base.uk","Leicestershire","LEI"
+"LIN","base.uk","Lincolnshire","LIN"
+"MSY","base.uk","Merseyside","MSY"
+"NFK","base.uk","Norfolk","NFK"
+"NRY","base.uk","North Riding of Yorkshire","NRY"
+"NYK","base.uk","North Yorkshire","NYK"
+"NTH","base.uk","Northamptonshire","NTH"
+"NBL","base.uk","Northumberland","NBL"
+"NTT","base.uk","Nottinghamshire","NTT"
+"OXF","base.uk","Oxfordshire","OXF"
+"RUT","base.uk","Rutland","RUT"
+"SAL","base.uk","Shropshire","SAL"
+"SOM","base.uk","Somerset","SOM"
+"SYK","base.uk","South Yorkshire","SYK"
+"STS","base.uk","Staffordshire","STS"
+"SFK","base.uk","Suffolk","SFK"
+"SRY","base.uk","Surrey","SRY"
+"SSX","base.uk","Sussex","SSX"
+"TWR","base.uk","Tyne and Wear","TWR"
+"WAR","base.uk","Warwickshire","WAR"
+"WMD","base.uk","West Midlands","WMD"
+"WRY","base.uk","West Riding of Yorkshire","WRY"
+"SXW","base.uk","West Sussex","SXW"
+"WYK","base.uk","West Yorkshire","WYK"
+"WES","base.uk","Westmorland","WES"
+"WIL","base.uk","Wiltshire","WIL"
+"WOR","base.uk","Worcestershire","WOR"
+"YKS","base.uk","Yorkshire","YKS"
+"CAR","base.ie","Co. Carlow","CAR"
+"CAV","base.ie","Co. Cavan","CAV"
+"CLA","base.ie","Co. Clare","CLA"
+"COR","base.ie","Co. Cork","COR"
+"DON","base.ie","Co. Donegal","DON"
+"DUB","base.ie","Co. Dublin","DUB"
+"GAL","base.ie","Co. Galway","GAL"
+"KER","base.ie","Co. Kerry","KER"
+"KID","base.ie","Co. Kildare","KID"
+"KIK","base.ie","Co. Kilkenny","KIK"
+"LEX","base.ie","Co. Laois","LEX"
+"LET","base.ie","Co. Leitrim","LET"
+"LIM","base.ie","Co. Limerick","LIM"
+"LOG","base.ie","Co. Longford","LOG"
+"LOU","base.ie","Co. Louth","LOU"
+"MAY","base.ie","Co. Mayo","MAY"
+"MEA","base.ie","Co. Meath","MEA"
+"MOG","base.ie","Co. Monaghan","MOG"
+"OFF","base.ie","Co. Offaly","OFF"
+"ROS","base.ie","Co. Roscommon","ROS"
+"SLI","base.ie","Co. Sligo","SLI"
+"TIP","base.ie","Co. Tipperary","TIP"
+"WAT","base.ie","Co. Waterford","WAT"
+"WEM","base.ie","Co. Westmeath","WEM"
+"WEX","base.ie","Co. Wexford","WEX"
+"WIC","base.ie","Co. Wicklow","WIC"
+"ANT","base.uk","Co. Antrim","ANT"
+"ARM","base.uk","Co. Armagh","ARM"
+"DOW","base.uk","Co. Down","DOW"
+"FER","base.uk","Co. Fermanagh","FER"
+"LDY","base.uk","Co. Londonderry","LDY"
+"TYR","base.uk","Co. Tyrone","TYR"
+"ABD","base.uk","Aberdeenshire","ABD"
+"ANS","base.uk","Angus","ANS"
+"ARL","base.uk","Argyllshire","ARL"
+"AYR","base.uk","Ayrshire","AYR"
+"BAN","base.uk","Banffshire","BAN"
+"BEW","base.uk","Berwickshire","BEW"
+"BOR","base.uk","Borders","BOR"
+"BUT","base.uk","Bute","BUT"
+"CAI","base.uk","Caithness","CAI"
+"CEN","base.uk","Central","CEN"
+"CLK","base.uk","Clackmannanshire","CLK"
+"DGY","base.uk","Dumfries and Galloway","DGY"
+"DFS","base.uk","Dumfries-shire","DFS"
+"DNB","base.uk","Dunbartonshire","DNB"
+"ELN","base.uk","East Lothian","ELN"
+"FIF","base.uk","Fife","FIF"
+"GMP","base.uk","Grampian","GMP"
+"HLD","base.uk","Highland","HLD"
+"INV","base.uk","Inverness-shire","INV"
+"KCD","base.uk","Kincardineshire","KCD"
+"KRS","base.uk","Kinross-shire","KRS"
+"KKD","base.uk","Kirkcudbrightshire","KKD"
+"LKS","base.uk","Lanarkshire","LKS"
+"LTN","base.uk","Lothian","LTN"
+"MLN","base.uk","Midlothian","MLN"
+"MOR","base.uk","Morayshire","MOR"
+"NAI","base.uk","Nairn","NAI"
+"OKI","base.uk","Orkney","OKI"
+"PEE","base.uk","Peebles-shire","PEE"
+"PER","base.uk","Perth","PER"
+"RFW","base.uk","Renfrewshire","RFW"
+"ROC","base.uk","Ross and Cromarty","ROC"
+"ROX","base.uk","Roxburghshire","ROX"
+"SEL","base.uk","Selkirkshire","SEL"
+"SHI","base.uk","Shetland","SHI"
+"STI","base.uk","Stirlingshire","STI"
+"STD","base.uk","Strathclyde","STD"
+"SUT","base.uk","Sutherland","SUT"
+"TAY","base.uk","Tayside","TAY"
+"WLN","base.uk","West Lothian","WLN"
+"WIS","base.uk","Western Isles","WIS"
+"WIG","base.uk","Wigtownshire","WIG"
+"AGY","base.uk","Anglesey","AGY"
+"BRE","base.uk","Breconshire","BRE"
+"CAE","base.uk","Caernarvonshire","CAE"
+"CGN","base.uk","Cardiganshire","CGN"
+"CMN","base.uk","Carmarthenshire","CMN"
+"CWD","base.uk","Clwyd","CWD"
+"DEN","base.uk","Denbighshire","DEN"
+"DFD","base.uk","Dyfed","DFD"
+"FLN","base.uk","Flintshire","FLN"
+"GLA","base.uk","Glamorgan","GLA"
+"GNT","base.uk","Gwent","GNT"
+"GWN","base.uk","Gwynedd","GWN"
+"MER","base.uk","Merionethshire","MER"
+"MGM","base.uk","Mid Glamorgan","MGM"
+"MON","base.uk","Monmouthshire","MON"
+"MGY","base.uk","Montgomeryshire","MGY"
+"PEM","base.uk","Pembrokeshire","PEM"
+"POW","base.uk","Powys","POW"
+"RAD","base.uk","Radnorshire","RAD"
+"SGM","base.uk","South Glamorgan","SGM"
+"WGM","base.uk","West Glamorgan","WGM"