Fix conflict
This commit is contained in:
@@ -74,10 +74,6 @@ booking_status = Lookup.create([{lookup_type:'booking_status', name: 'Available'
|
|||||||
account_type = Lookup.create([{lookup_type:'account_type', name: 'Income', value: 'income'},
|
account_type = Lookup.create([{lookup_type:'account_type', name: 'Income', value: 'income'},
|
||||||
{lookup_type:'account_type', name: 'Expense', value: 'expense'}])
|
{lookup_type:'account_type', name: 'Expense', value: 'expense'}])
|
||||||
|
|
||||||
#Account for Menu Item Type (eg: Food, Beverage)
|
|
||||||
food = Account.create({title: "Food", account_type: "0"})
|
|
||||||
beverage = Account.create({title: "Beverage", account_type: "1"})
|
|
||||||
|
|
||||||
#WALK CUSTOMER - Default CUSTOMER (take key 1)
|
#WALK CUSTOMER - Default CUSTOMER (take key 1)
|
||||||
customer = Customer.create({id:1, name:"WALK-IN", contact_no:"000000000"})
|
customer = Customer.create({id:1, name:"WALK-IN", contact_no:"000000000"})
|
||||||
customer = Customer.create({id:2, name:"TAKEAWAY", contact_no:"000000000"})
|
customer = Customer.create({id:2, name:"TAKEAWAY", contact_no:"000000000"})
|
||||||
|
|||||||
Reference in New Issue
Block a user