Yan 342bd54780 Merge branch 'master' into cloud

2017-12-14 10:25:41 +06:30

..

concerns

…

printer

merge with master

2017-12-13 11:43:22 +06:30

ability.rb

update ability and report xls

2017-12-01 13:54:58 +06:30

account.rb

…

application_record.rb

…

assigned_order_item.rb

…

booking_order.rb

…

booking.rb

…

cashier_login_log.rb

…

cashier_terminal_by_zone.rb

…

cashier_terminal.rb

…

commission.rb

…

commissioner.rb

…

crm.rb

…

customer.rb

update paymal response record and show double payment

2017-12-08 13:59:05 +06:30

dining_charge.rb

…

dining_facility.rb

change query for dashboard and time for checkin channel

2017-12-13 18:30:04 +06:30

dining_queue.rb

…

employee.rb

…

in_duty.rb

…

inventory_definition.rb

…

item_set.rb

…

license.rb

dashboard hourly sale and license code clean

2017-12-12 17:41:35 +06:30

lookup.rb

…

membership_action.rb

…

membership_setting.rb

…

menu_category.rb

…

menu_instance_item_set.rb

…

menu_item_attribute.rb

…

menu_item_instance.rb

update instanc code unique receipt bill and sale item

2017-12-04 12:18:20 +06:30

menu_item_option.rb

…

menu_item_set.rb

…

menu_item.rb

add menu item taxable

2017-12-04 14:54:47 +06:30

menu.rb

…

my_aes_crypt.rb

license cloud finished

2017-12-08 16:26:41 +06:30

order_item.rb

add menu item taxable

2017-12-04 14:54:47 +06:30

order_queue_process_by_zone.rb

…

order_queue_station.rb

no print for cloud

2017-12-12 18:51:13 +06:30

order.rb

add menu item taxable

2017-12-04 14:54:47 +06:30

payment_journal.rb

…

payment_method_setting.rb

…

print_setting.rb

…

product_commission.rb

…

product.rb

…

promotion_product.rb

…

promotion.rb

…

room_booking.rb

…

room.rb

…

sale_audit.rb

update rebate double and old balance

2017-12-12 17:52:05 +06:30

sale_item.rb

update sale item xls

2017-12-05 16:28:21 +06:30

sale_order.rb

…

sale_payment.rb

Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui

2017-12-12 18:06:52 +06:30

sale_tax.rb

…

sale.rb

Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes

2017-12-13 18:30:27 +06:30

seed_generator.rb

…

set_menu_item.rb

…

settings.rb

…

shift_sale.rb

total account discount for close shift sale

2017-12-01 15:15:58 +06:30

shop.rb

update rounding adj

2017-11-30 15:44:48 +06:30

simple_menu_item.rb

…

stock_check_item.rb

…

stock_check.rb

…

stock_journal.rb

…

survey.rb

…

table_booking.rb

…

table.rb

…

tax_profile.rb

…

zone.rb

…