Account.tjp in taskjuggler-3.1.0

- old
+ new

@@ -4,28 +4,31 @@
 }
 
 # *** EXAMPLE: 1 +
 account project_cost "Project Costs"
 account payments "Customer Payments"{
-  credit 2007-01-08 "Customer down payment" 500.0
+  credits 2007-01-01 "Customer down payment" 500.0,
+          2007-01-14 "1st rate" 2000.0
 }
 
+balance project_cost payments
+
 resource tux "Tux" {
   rate 300
 }
 resource konqui "Konqui" {
   rate 200
 }
 
 task items "Room decoration" {
   start 2007-01-06
   # The default account for all tasks
-  account project_cost
+  chargeset project_cost
 
   task plan "Plan work and buy material" {
     # Upfront material cost
-    startcredit 500.0
+    charge 500.0 onstart
     length 2d
   }
    task remove "Remove old inventory" {
     allocate tux
     allocate konqui
@@ -38,17 +41,27 @@
     depends !remove
   }
   task acceptance "Presentation and customer acceptance" {
     duration 5d
     depends !implement
-    account payments
+    chargeset payments
     # Customer pays at end of acceptance
-    endcredit 2000.0
+    charge 2000.0 onend
   }
 }
 # *** EXAMPLE: 1 -
 
-# accountreport pandl "PAndL.html" {
-#   timeformat "%d-%M-%y"
-#   accumulate
-#   columns index, name, weekly
-# }
+accountreport "Account-1" {
+  formats html
+  timeformat "%d-%M-%y"
+  columns index, name, weekly
+}
+
+accountreport "Account-2" {
+  formats html
+  timeformat "%d-%M-%y"
+  columns index,
+          name,
+          weekly {
+            celltext 1 "<-query attribute='turnover'->"
+          }
+}