Sagar Vora
|
7ddbd386a5
|
Merge branch 'master' into hotfix
|
2019-01-29 18:56:45 +05:30 |
|
Sagar Vora
|
1c44a6a0ba
|
fix: set version to 11.1.0, remove staging_version
|
2019-01-29 18:52:50 +05:30 |
|
Sagar Vora
|
605fbf4f89
|
Merge branch 'staging'
|
2019-01-29 18:51:12 +05:30 |
|
Sagar Vora
|
3f1fb9ca7e
|
Merge branch 'staging-fixes' into staging
|
2019-01-29 18:26:34 +05:30 |
|
Sagar Vora
|
1a4cd3b66a
|
bumped to version 11.1.0
|
2019-01-29 18:46:34 +05:50 |
|
Sagar Vora
|
606bd37316
|
fix: change changelog version to 11.1.0
|
2019-01-29 17:55:46 +05:30 |
|
Sagar Vora
|
b5dda63ddd
|
fix: change changelog version to 11.1.0
|
2019-01-29 17:54:47 +05:30 |
|
Sagar Vora
|
51a27b3524
|
fix: unsaved merge conflict
|
2019-01-29 17:52:47 +05:30 |
|
Sagar Vora
|
f3cfad7595
|
Merge branch 'master' into staging-fixes
|
2019-01-29 17:20:46 +05:30 |
|
Sagar Vora
|
898977bda8
|
Merge branch 'hotfix'
|
2019-01-29 17:10:19 +05:30 |
|
Sagar Vora
|
b32d9458b5
|
bumped to version 10.1.81
|
2019-01-29 17:30:19 +05:50 |
|
Nabin Hait
|
f8e9734f16
|
Merge pull request #16514 from sagarvora/changelog
docs: changelog for v11.0.4
|
2019-01-29 16:27:07 +05:30 |
|
rohitwaghchaure
|
a95ed44d3d
|
fix: test case for fiscal year (#16516)
|
2019-01-29 16:24:53 +05:30 |
|
Nabin Hait
|
9f33c208d7
|
Update v11_0_4.md
|
2019-01-29 16:07:07 +05:30 |
|
Sagar Vora
|
bad36ef3ef
|
fix: add node_modules to gitignore (#16515)
|
2019-01-29 16:00:45 +05:30 |
|
Sagar Vora
|
7ef69b68f8
|
Update v11_0_4.md
|
2019-01-29 15:52:57 +05:30 |
|
Nabin Hait
|
cc41b876fb
|
Merge pull request #16497 from nabinhait/bom_price
BOM raw materials price
|
2019-01-29 14:58:40 +05:30 |
|
Nabin Hait
|
49c1f023b1
|
Merge pull request #16507 from rohitwaghchaure/fiscal_year_should_always_be_for_12_months
fix: fiscal year should always be for 12 months
|
2019-01-29 14:44:43 +05:30 |
|
Sagar Vora
|
115a252f55
|
docs: changelog for v11.0.4
|
2019-01-29 14:40:10 +05:30 |
|
Nabin Hait
|
4e45663297
|
fix(stock): get item price based on party
|
2019-01-29 14:02:08 +05:30 |
|
Sagar Vora
|
8f6509fa9a
|
Merge branch 'staging-fixes' into fiscal_year_should_always_be_for_12_months
|
2019-01-29 13:04:20 +05:30 |
|
Sagar Vora
|
9520e345bd
|
fix: better error messages
|
2019-01-29 13:03:46 +05:30 |
|
Nabin Hait
|
1df9a23e7b
|
Merge pull request #16513 from rohitwaghchaure/remove_zero_qty_items_on_click_os_pay
feat: on click of pay button and on focus out of qty field remove the zero qty items from the cart
|
2019-01-29 13:02:56 +05:30 |
|
Rohit Waghchaure
|
07f75a3e54
|
feat: on click of pay button and on focus out of qty field remove the zero qty items from the cart
|
2019-01-29 13:00:18 +05:30 |
|
Rohit Waghchaure
|
a8e743e3c4
|
fix: fiscal year always be for 12 months
|
2019-01-29 12:55:04 +05:30 |
|
Nabin Hait
|
6f7cc8b186
|
Merge pull request #16505 from deepeshgarg007/pos_issue
feat: Enhancement in POS functionality
|
2019-01-29 12:51:00 +05:30 |
|
Nabin Hait
|
25cb13c0f8
|
Merge pull request #16508 from navdeepghai1/salary-slip-net-pay-fixes
fix(human resources): gross pay calculation issue
|
2019-01-29 12:08:11 +05:30 |
|
Nabin Hait
|
7fc9825954
|
Merge pull request #16368 from ESS-LLP/pr_staging_fixes_2
feat: List Active Healthcare Practitioner
|
2019-01-29 11:52:55 +05:30 |
|
Nabin Hait
|
8ba9545b72
|
Merge pull request #16498 from nabinhait/stock-ledger-report
fix(stock): Escaping issue in stock ledger report
|
2019-01-29 11:30:15 +05:30 |
|
Deepesh Garg
|
a8cc4b105d
|
Merge branch 'staging-fixes' into pos_issue
|
2019-01-29 11:29:41 +05:30 |
|
Nabin Hait
|
3b8623e207
|
Merge pull request #16491 from adityahase/ar-fix
fix(ar-summary): Changes to column list to match recent changes
|
2019-01-29 11:28:02 +05:30 |
|
Nabin Hait
|
1467962f8a
|
Merge pull request #16490 from nabinhait/gst_settings_perm
GST Settings permission and regional taxes creation
|
2019-01-29 11:27:18 +05:30 |
|
Nabin Hait
|
ff2922cbbb
|
Merge pull request #16488 from deepeshgarg007/price_list
fix(sales_invoice): fetch customer price list if available before pos price list
|
2019-01-29 11:24:22 +05:30 |
|
Nabin Hait
|
7c0fbfab0a
|
Merge pull request #16482 from pipech/staging-fixes
fix(Stock Entry): "Select Serial Numbers" dialog won't fill mandatory field
|
2019-01-29 11:23:05 +05:30 |
|
Nabin Hait
|
3ccc16e4e0
|
Merge pull request #16449 from scmmishra/remove-foundation
feat: Deprecated In App Help
|
2019-01-29 11:20:23 +05:30 |
|
Nabin Hait
|
0bfd990ada
|
Merge pull request #16456 from adityahase/unicode
fix(unicode): Import unicode_literals in every file
|
2019-01-29 11:13:30 +05:30 |
|
Nabin Hait
|
e8190473f5
|
Merge branch 'staging-fixes' into unicode
|
2019-01-29 11:13:04 +05:30 |
|
Nabin Hait
|
1c5d681f65
|
Merge pull request #16500 from scmmishra/v10-remove-docs
feat: [v10] Deprecate In App Help
|
2019-01-29 11:05:25 +05:30 |
|
Nabin Hait
|
8fae0b3017
|
Merge pull request #16242 from rohitwaghchaure/is_fixed_asset_checkbox_not_copied
[Fix] Is fixed asset checkbox not checked if user duplicate the existing invoice
|
2019-01-29 11:03:44 +05:30 |
|
Nabin Hait
|
57928a5382
|
Merge pull request #16468 from sagarvora/fix-scorecard
fix(buying): make supplier scorecard usable
|
2019-01-29 11:00:18 +05:30 |
|
Nabin Hait
|
b44b200e7c
|
Merge branch 'hotfix' into fix-scorecard
|
2019-01-29 11:00:07 +05:30 |
|
Aditya Hase
|
9acb885e60
|
fix(sqli): Avoid SQL Injection with sender param (#16509)
|
2019-01-29 10:52:37 +05:30 |
|
Navdeep Ghai
|
ec570026e1
|
Merge branch 'hotfix' into salary-slip-net-pay-fixes
|
2019-01-29 09:12:37 +04:00 |
|
Nabin Hait
|
385e3bb284
|
Merge pull request #16446 from Zlash65/jv-fix
fix(accounts): wrong filters sent to fetch reference name in Journal Entry
|
2019-01-29 10:41:15 +05:30 |
|
navdeepghai1
|
92bb84aa70
|
Changed static precision(2) value to system setting currency_precision value
|
2019-01-28 16:54:58 +04:00 |
|
deepeshgarg007
|
f0cfe98860
|
fix: Added missing semicolon and removed null from parameter
|
2019-01-28 17:58:44 +05:30 |
|
deepeshgarg007
|
0bee62b460
|
fix: Made period fields read only and added validation for multiple entries by same user
|
2019-01-28 12:45:11 +05:30 |
|
Sagar Vora
|
a1a946fcd6
|
Merge branch 'hotfix' into fix-scorecard
|
2019-01-28 12:20:55 +05:30 |
|
navdeepghai1
|
aac404a155
|
Fixed net_pay calculation issue
|
2019-01-28 10:42:16 +04:00 |
|
deepeshgarg007
|
4e4b200972
|
Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into pos_issue
|
2019-01-27 22:54:34 +05:30 |
|