Help for the user - not very elegant I am afraid.

ghost commented 12 years ago

Change of field order on Usage. Change of field name & order; add units for one field; on Meter Display. Charge KVA still being used in Tender Display - changed to capacity. Remove ChargeKVA completely from code (it was commented out but removed so DB schema can have it removed safely. Added to fields on Contract Display - Meter Tab; supplier_phone =>supplierCo_phone. Meter_type => meter_status when adding meter to contract.

If these look OK can you merge in please. Thanks. E

shaunfreeman commented 12 years ago

I will have to merge this manually as there are a few conflicts with this one.

ghost commented 12 years ago

Sorry about that - thought I might be safe on Sunday.

I have backed out my changes in the conflicts and re-done them on the new master.

I am assuming eddie2 will go in with no issues. Let me know if not.

Eddie

Eddie Pounce Pounce Computer Services 01767 348186 http://www.p-cs.co.uk

On 19/02/2012 23:06, Shaun Freeman wrote:

I will have to merge this manually as there are a few conflicts with this one.

Reply to this email directly or view it on GitHub: https://github.com/b-b-a/bba-power/pull/96#issuecomment-4046161

b-b-a / bba-power

Help for the user - not very elegant I am afraid. #96

Eddie