lp:~credativ/l10n-openerp-uk/credativ-upstream-changes

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:l10n-openerp-uk

Vadim - Enapps LTD: Needs Fixing on 2011-11-23

Diff: 710 lines (+345/-329)

6 files modified

l10n_openerp_uk/__openerp__.py (+2/-0)
l10n_openerp_uk/data/account.account.template.csv (+161/-161)
l10n_openerp_uk/data/account.fiscal.position.tax.template.csv (+6/-0)
l10n_openerp_uk/data/account.fiscal.position.template.csv (+5/-0)
l10n_openerp_uk/data/account.tax.template.csv (+19/-16)
l10n_openerp_uk/data/res.country.state.csv (+152/-152)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

20. By Dimitri John Ledkov on 2011-11-23

[IMP] add missing rates, remove python calculations

* It seemed that python calculations were redundant, correct me if I'm wrong.
  E.g. a stock % formula works fine

* Add additional tax rates for rare corner cases in the VAT when dealing with
  EU/World sales for non-standard business (exempts, zero rated, out-of-scope or
  non-vat registered, etc.)

19. By Dimitri John Ledkov on 2011-11-23

[FIX] Changes, improvements and corrections to chart of accounts

Word by Word comments:

[-.*-] - deletions
{+.*+} - additions

#General - use unix line endings instead of windows line endings

# Quote the id & account number, to make sure account nr. padding works correctly
# Experienced issues with '0010' converted by OpenERP to '10' padded to lengeth four as '1000' instead of
# expected '0010'
[-0010,0010,"Freehold-]{+"0010","0010","Freehold+} Property","000a","other","account_type_fixed_assets","FALSE"
[-0011,0011,"Leasehold-]{+"0011","0011","Leasehold+} Property","000a","other","account_type_fixed_assets","FALSE"
[-0020,0020,"Plant-]{+"0020","0020","Plant+} and Machinery","000a","other","account_type_fixed_assets","FALSE"
[-0021,0021,"Plant/Machinery-]{+"0021","0021","Plant/Machinery+} Depreciation","000a","other","account_type_fixed_assets","FALSE"
[-0030,0030,"Office-]{+"0030","0030","Office+} Equipment","000a","other","account_type_fixed_assets","FALSE"
[-0031,0031,"Office-]{+"0031","0031","Office+} Equipment Depreciation","000a","other","account_type_fixed_assets","FALSE"
[-0040,0040,"Furniture-]{+"0040","0040","Furniture+} and Fixtures","000a","other","account_type_fixed_assets","FALSE"
[-0041,0041,"Furniture/Fixture-]{+"0041","0041","Furniture/Fixture+} Depreciation","000a","other","account_type_fixed_assets","FALSE"
[-0050,0050,"Motor-]{+"0050","0050","Motor+} Vehicles","000a","other","account_type_fixed_assets","FALSE"
[-0051,0051,"Motor-]{+"0051","0051","Motor+} Vehicles Depreciation","000a","other","account_type_fixed_assets","FALSE"

# Change Sundry/other Debtors/Creditors:
# other/account_type_current_assets -> receivable/account_type_receivable
# other/account_type_current_liabilities -> payable/account_type_payable
1101,1101,"Sundry [-Debtors","000b","other","account_type_current_assets","TRUE"-]{+Debtors","000b","receivable","account_type_receivable","TRUE"+}
1102,1102,"Other [-Debtors","000b","other","account_type_current_assets","TRUE"^M-]{+Debtors","000b","receivable","account_type_receivable","TRUE"+}
2101,2101,"Sundry [-Creditors","000c","other","account_type_current_liabilities","TRUE"-]{+Creditors","000c","payable","account_type_payable","TRUE"+}
2102,2102,"Other [-Creditors","000c","other","account_type_current_liabilities","TRUE"^M-]{+Creditors","000c","payable","account_type_payable","TRUE"+}

# Prepayments -> are in fact a liability (I owe goods or services, because I got the money already)
# Accruals -> are in fact an asset (I got free stuff, and don't have to pay yet)
#
# From untrusted wikipedia.org source
"""
Deferred revenue (or deferred income) is a liability, such as cash received from
a counterpart for goods or services that are to be delivered in a later
accounting period. When such income item is earned, the related revenue item is
recognized, and the deferred revenue is reduced. It shares characteristics with
accrued expense with the difference that a liability to be covered later is an
obligation to pay for goods or services received from a counterpart, while cash
for them is to be paid out in a later period when its amount is deducted from
accrued expenses.

For example, a company receives an annual software license fee paid out by a
customer upfront on the January 1. However the company's fiscal year ends on May
31. So, the company using accrual accounting adds only five months worth (5/12)
of the fee to its revenues in profit and loss for the fiscal year the fee was
received. The rest is added to deferred income (liability) on the balance sheet
for that year.
"""
1103,1103,"Prepayments","000b","other",[-"account_type_current_assets","TRUE"-]{+"account_type_current_liabilities","TRUE"+}
2109,2109,"Accruals","000c","other",[-"account_type_current_liabilities","TRUE"-]{+"account_type_current_assets","TRUE"+}

# Turn off reconcile flag on liquidity.
# NB! reconcile flag here means 'matching entries'
# read again http://doc.openerp.com/v6.0/book/3/3_7/accounting_entries.html#reconciliation-process
#
# The account that have reconcile flag are 'Debtors & Creditors control accounts'
# Because that account is used to reconcile 'individual income & expence lines' with corresponding 'payments'
#
# For OpenERP devs 'Debtors & creditors control accounts' is the lookup table (reconcile flag=TRUE) for the many2many
# relationship between table1 ('income&expences') and table2 ('payments')
#
#
1200,1200,"Bank Current [-Account","000b","liquidity","account_type_current_assets","TRUE"-]{+Account","000b","liquidity","account_type_current_assets","FALSE"+}
1210,1210,"Bank Deposit [-Account","000b","liquidity","account_type_current_assets","TRUE"-]{+Account","000b","liquidity","account_type_current_assets","FALSE"+}
1220,1220,"Building Society [-Account","000b","liquidity","account_type_current_assets","TRUE"-]{+Account","000b","liquidity","account_type_current_assets","FALSE"+}
1230,1230,"Petty [-Cash","000b","other","account_type_current_assets","TRUE"-]{+Cash","000b","other","account_type_current_assets","FALSE"+}
1240,1240,"Company Credit [-Card","000c","other","account_type_current_liabilities","TRUE"-]{+Card","000c","other","account_type_current_liabilities","FALSE"+}

#
# Turned the reconcile flag as per above, not sure if these should be other/expence or payable/payable so I'm not changing the type
#
2202,2202,"VAT [-Liability","000c","payable","account_type_payable","TRUE"-]{+Liability","000c","payable","account_type_payable","FALSE"+}
[-2210,2210,"P.A.Y.E.","000c","payable","account_type_payable","TRUE"-]{+2210,2210,"P.A.Y.E.","000c","payable","account_type_payable","FALSE"+}
2220,2220,"Net [-Wages","000c","payable","account_type_payable","TRUE"-]{+Wages","000c","payable","account_type_payable","FALSE"+}

18. By Dimitri John Ledkov on 2011-11-23

[FIX] Add id column to states, otherwise they are not imported

17. By Dimitri John Ledkov on 2011-11-23

[IMP] Add fiscal positions

16. By Colin MacMillan on 2011-03-24

add folder structure

15. By Colin MacMillan on 2011-03-24

added folder l10n_openerp_uk

14. By Vadim - Enapps LTD on 2011-01-21

changed internal name

13. By Vadim - Enapps LTD on 2011-01-21

added PT18 and PT18R - 20% for reverse EC purchases

12. By Vadim - Enapps LTD on 2010-12-11

PAYE, Net Wages and VAT liablity set as payables.

11. By Colin MacMillan on 2010-12-08

correct bzr merge problem