git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into license

Browse Source
This commit is contained in:
Yan
2017-11-28 17:07:58 +06:30
parent c4e9abbf19 0b03c243ec
commit f33be9e707
67 changed files with 538 additions and 397 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/locales/en.yml
View File

@@ -279,6 +279,7 @@ en:
additional_parameters: "Additional parameters"
title: "Title"
discount: "Discount"
item_discount: "Item Discount"
point: "Point"
bonus: "Bonus"
rebate: "Rebate"
@@ -402,6 +403,7 @@ en:
cash_sales: "Cash Sales"
credit_sales: "Credit Sales"
foc_sales: "FOC Sales"
foc_item: "Item FOC"
net_amount: "Net Amount"
sale_item_report: "Sale Item Report"
select_period: "Select Period"