phyusin 311bef4411 merge with Old Town Req

2018-03-05 15:10:36 +06:30

..

concerns

…

printer

Merge branch 'r-1802001-01-c1' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes

2018-02-26 18:47:17 +06:30

ability.rb

add link for oqs in origami

2018-02-22 18:51:57 +06:30

account.rb

…

application_record.rb

…

assigned_order_item.rb

…

booking_order.rb

…

booking.rb

change query for origami

2018-02-16 17:47:34 +06:30

card_sale_tran.rb

…

card_settle_tran.rb

…

cashier_login_log.rb

…

cashier_terminal_by_zone.rb

…

cashier_terminal.rb

…

commission.rb

…

commissioner.rb

…

crm.rb

…

customer.rb

update rom and table show

2018-01-27 13:16:42 +06:30

dining_charge.rb

…

dining_facility.rb

conflic data

2018-02-09 10:17:56 +06:30

dining_queue.rb

…

employee.rb

…

in_duty.rb

…

inventory_definition.rb

…

item_set.rb

…

license.rb

update conflic for pull master

2018-02-23 14:58:35 +06:30

lookup.rb

…

membership_action.rb

…

membership_setting.rb

…

menu_category.rb

update add oredr

2018-02-28 10:14:18 +06:30

menu_instance_item_set.rb

…

menu_item_attribute.rb

…

menu_item_instance.rb

…

menu_item_option.rb

…

menu_item_set.rb

…

menu_item.rb

update oqs js

2018-02-23 11:12:58 +06:30

menu.rb

update menu category

2018-02-19 09:12:51 +06:30

my_aes_crypt.rb

…

order_item.rb

…

order_queue_process_by_zone.rb

…

order_queue_station.rb

update taday list and addorder

2018-02-22 18:48:59 +06:30

order.rb

update no table oqs print

2018-02-21 16:11:05 +06:30

payment_journal.rb

…

payment_method_setting.rb

…

print_setting.rb

change ReceiptBillPdf

2018-02-28 10:20:50 +06:30

product_commission.rb

…

product.rb

check product account

2018-03-05 15:00:18 +06:30

promotion_product.rb

…

promotion.rb

…

room_booking.rb

…

room.rb

…

sale_audit.rb

update foc and void overall add remark

2018-02-23 14:53:08 +06:30

sale_item.rb

update edit with remark

2018-02-26 16:56:57 +06:30

sale_order.rb

…

sale_payment.rb

fixed conflic when pull master item remark

2018-02-26 17:02:46 +06:30

sale_tax.rb

…

sale.rb

merge with Old Town Req

2018-03-05 15:10:36 +06:30

seed_generator.rb

…

set_menu_item.rb

…

settings.rb

…

shift_sale.rb

To update close cashier

2018-02-20 17:35:54 +06:30

shop.rb

…

simple_menu_item.rb

…

stock_check_item.rb

…

stock_check.rb

…

stock_journal.rb

change stock check for dashboard query

2018-02-27 10:04:48 +06:30

survey.rb

…

table_booking.rb

…

table.rb

…

tax_profile.rb

…

zone.rb

…