merge conflict and job/dept discounts support.

2020-05-03 02:11:05 +02:00
parent 94f014589d c1d1e4f0c0
commit a194d7dafe
308 changed files with 6846 additions and 9140 deletions
@@ -14,3 +14,4 @@
 	default_price = 400
 	extra_price = 600
 	payment_department = ACCOUNT_SCI
+	cost_multiplier_per_dept = list(ACCOUNT_SCI = 0)