Yan e09559c508 merge with august spring but merge fail

2017-08-31 15:58:01 +06:30

..

concerns

…

printer

merge with august spring but merge fail

2017-08-31 15:58:01 +06:30

ability.rb

…

account.rb

fixed conflict

2017-06-07 22:29:43 +06:30

application_record.rb

init project commit

2017-03-24 19:58:23 +06:30

assigned_order_item.rb

…

booking_order.rb

…

booking.rb

update long bill

2017-07-21 17:07:31 +06:30

cashier_login_log.rb

…

cashier_terminal.rb

order queue and print station

2017-04-03 22:30:27 +06:30

commission.rb

commission report

2017-08-29 18:36:46 +06:30

commissioner.rb

commission update -> change route under settings

2017-08-28 09:46:36 +06:30

crm.rb

…

customer.rb

Merge branch 'addorder' of bitbucket.org:code2lab/sxrestaurant

2017-08-24 15:21:46 +06:30

dining_charge.rb

Dining Charges Fix for free time

2017-08-23 13:59:27 +06:30

dining_facility.rb

CRUDIn_Juties

2017-08-23 18:14:31 +06:30

dining_queue.rb

…

employee.rb

load commissioner

2017-08-23 10:24:26 +06:30

in_juty.rb

CRUDIn_Juties

2017-08-23 18:14:31 +06:30

inventory_definition.rb

inventory

2017-08-30 14:19:24 +06:30

item_set.rb

…

lookup.rb

…

membership_action.rb

…

membership_setting.rb

…

menu_category.rb

…

menu_instance_item_set.rb

…

menu_item_attribute.rb

update form attr name to attr id to instances

2017-08-31 11:41:38 +06:30

menu_item_instance.rb

…

menu_item_option.rb

…

menu_item_set.rb

…

menu_item.rb

CRUD Update for Promotion

2017-08-30 18:22:22 +06:30

menu.rb

…

order_item.rb

add item instance code to order item

2017-08-28 14:19:40 +06:30

order_queue_process_by_zone.rb

…

order_queue_station.rb

…

order.rb

Merge branch 'addorder' of bitbucket.org:code2lab/sxrestaurant

2017-08-28 18:27:58 +06:30

payment_journal.rb

…

payment_method_setting.rb

…

print_setting.rb

…

product_commission.rb

commission report

2017-08-29 18:36:46 +06:30

product.rb

commission update

2017-08-23 11:14:24 +06:30

promotion_product.rb

Promotion Product Bug Fix

2017-08-24 14:37:11 +06:30

promotion.rb

Promotion by Instance

2017-08-30 18:57:35 +06:30

room_booking.rb

…

room.rb

…

sale_audit.rb

…

sale_item.rb

commission in sale edit

2017-08-25 13:44:22 +06:30

sale_order.rb

…

sale_payment.rb

add doc in readme.md

2017-08-25 18:56:46 +06:30

sale_tax.rb

…

sale.rb

inventory

2017-08-30 14:19:24 +06:30

seed_generator.rb

update receipt no twice and sale order double and report changes

2017-07-31 09:39:34 +06:30

set_menu_item.rb

…

settings.rb

settings controllers

2017-04-18 13:01:05 +06:30

shift_sale.rb

…

shop.rb

promotion

2017-08-23 09:48:15 +06:30

simple_menu_item.rb

…

stock_check_item.rb

inventory

2017-08-30 14:19:24 +06:30

stock_check.rb

inventory

2017-08-30 14:19:24 +06:30

stock_journal.rb

inventory

2017-08-30 14:19:24 +06:30

table_booking.rb

…

table.rb

…

tax_profile.rb

…

zone.rb

…