Shreya Shah
|
9f931780a2
|
Merge pull request #15868 from ESS-LLP/fix-membership
fix: Membership - allow system users to create membership
|
2018-11-01 10:54:32 +05:30 |
|
Zarrar
|
92a4ff4e81
|
Merge pull request #15874 from shreyashah115/portal-fixes
Add overdue status for sales order
|
2018-11-01 10:46:08 +05:30 |
|
Ameya Shenoy
|
46e618bc6e
|
Merge branch 'staging-fixes' into staging
|
2018-10-31 13:51:24 +00:00 |
|
Ameya Shenoy
|
9f20f777b2
|
bumped to version 11.0.3-beta.17
|
2018-10-31 13:51:24 +00:00 |
|
Ameya Shenoy
|
961849beb4
|
Merge branch 'master' into staging-fixes
|
2018-10-31 13:43:12 +00:00 |
|
Ameya Shenoy
|
3f32218bc0
|
Merge branch 'hotfix'
|
2018-10-31 13:35:59 +00:00 |
|
Ameya Shenoy
|
b4bff7e298
|
bumped to version 10.1.66
|
2018-10-31 13:35:58 +00:00 |
|
deepeshgarg007
|
78b273af43
|
[Bug-Fix] Cannot Save Bank Statement Transaction Entry (#15793)
* Create bank settings only if bank name is available
* Minor bug-fix in validate_overlap
|
2018-10-31 18:12:03 +05:30 |
|
Shreya Shah
|
41c5fda196
|
fix(sms-center): Fix db query (#15774)
|
2018-10-31 18:04:30 +05:30 |
|
Shreya Shah
|
305c82bd8d
|
fix(medical-record): Remove z-index property (#15790)
|
2018-10-31 18:02:55 +05:30 |
|
rohitwaghchaure
|
cd11bdfdbb
|
[Fix] Supplier wise sales analytics report not showing item details which is added in purchase invoice with update stock (#15869)
|
2018-10-31 18:02:00 +05:30 |
|
Shreya Shah
|
0c0e49a421
|
fix: Fix fieldnames in template (#15860)
|
2018-10-31 18:00:09 +05:30 |
|
rohitwaghchaure
|
3f398d24f3
|
[Fix] Precision issue, not able to submit the stock entry (#15863)
|
2018-10-31 17:58:26 +05:30 |
|
Shreya
|
e3a7c68d4f
|
fix(portal): Add overdue status for sales order
|
2018-10-31 16:00:27 +05:30 |
|
Ranjith
|
f01bf9048d
|
fix: Membership - allow system users to create membership for existing Members
|
2018-10-31 14:33:28 +05:30 |
|
Ameya Shenoy
|
71ede099ea
|
Merge branch 'staging-fixes' into staging
|
2018-10-30 12:53:35 +00:00 |
|
Ameya Shenoy
|
d45fef5423
|
bumped to version 11.0.3-beta.16
|
2018-10-30 12:53:35 +00:00 |
|
Ameya Shenoy
|
6178b79555
|
Merge branch 'master' into staging-fixes
|
2018-10-30 12:48:45 +00:00 |
|
Ameya Shenoy
|
d9a82738d0
|
Merge branch 'hotfix'
|
2018-10-30 12:48:42 +00:00 |
|
Ameya Shenoy
|
1f7a5dcd07
|
bumped to version 10.1.65
|
2018-10-30 12:48:42 +00:00 |
|
Shreya Shah
|
452619c668
|
fix(report): Return if not list (#15849)
|
2018-10-30 11:26:01 +05:30 |
|
rohitwaghchaure
|
dca4b294bd
|
Merge pull request #15853 from rohitwaghchaure/delete_button_not_working_for_print_in_mobile
[Fix] Delete button not working in POS for mobile
|
2018-10-29 16:52:34 +05:30 |
|
Rohit Waghchaure
|
152a0c86b0
|
[Fix] Delete button not working in POS for Ipad
|
2018-10-29 16:50:18 +05:30 |
|
Shreya Shah
|
85a9b52dfa
|
Merge pull request #15789 from deepeshgarg007/production-analytics
[Bug-fix]Production analytics
|
2018-10-29 15:49:19 +05:30 |
|
Shreya Shah
|
69bbe1995c
|
Update production_analytics.py
|
2018-10-29 15:38:21 +05:30 |
|
rohitwaghchaure
|
9d0dba5569
|
Merge pull request #15851 from frappe/pos-delete-fix
fix: Delete button in POS mobile
|
2018-10-29 15:19:11 +05:30 |
|
deepeshgarg007
|
7b91f9fa0c
|
Bug Fixes
|
2018-10-29 15:16:25 +05:30 |
|
Faris Ansari
|
3df1327b94
|
fix: Delete button in POS mobile
Delete button was covered by page-actions container
|
2018-10-29 15:15:10 +05:30 |
|
Shreya Shah
|
81cdd967d7
|
Merge pull request #15794 from ashish-greycube/patch-1
Update employee_advance.py
|
2018-10-29 14:38:21 +05:30 |
|
alsum
|
27e7c15c16
|
trigger set_current_asset_value when make asset_value_adjustment from asset form
|
2018-10-24 13:23:34 +02:00 |
|
ashish-greycube
|
4d47c63db1
|
Update employee_advance.py
https://github.com/frappe/erpnext/issues/13694
Cancel of already paid "Expense Claim" gives error IntegrityError: (1048, u"Column 'claimed_amount' cannot be null")
Sol: claimed_amount should be flt
|
2018-10-24 16:35:31 +05:30 |
|
Ameya Shenoy
|
9750d5c184
|
Merge branch 'staging-fixes' into staging
|
2018-10-23 12:56:51 +00:00 |
|
Ameya Shenoy
|
6adcfa6032
|
bumped to version 11.0.3-beta.15
|
2018-10-23 12:56:51 +00:00 |
|
Ameya Shenoy
|
3643e7b1b4
|
Merge branch 'master' into staging-fixes
|
2018-10-23 12:52:48 +00:00 |
|
Ameya Shenoy
|
38eaaade89
|
Merge branch 'hotfix'
|
2018-10-23 12:52:46 +00:00 |
|
Ameya Shenoy
|
2a98e59bd4
|
bumped to version 10.1.64
|
2018-10-23 12:52:46 +00:00 |
|
Ameya Shenoy
|
03348364e9
|
Merge pull request #15739 from kennethsequeira/hotfix
Fix for "Improve this page" incorrect link generated in v10 sites
|
2018-10-23 18:05:25 +05:30 |
|
Ameya Shenoy
|
881bb4646b
|
Merge branch 'staging-fixes' into staging
|
2018-10-23 08:05:33 +00:00 |
|
Ameya Shenoy
|
4293d17602
|
bumped to version 11.0.3-beta.14
|
2018-10-23 08:05:33 +00:00 |
|
Ameya Shenoy
|
ca66c7ba14
|
Merge branch 'master' into staging-fixes
|
2018-10-23 08:01:13 +00:00 |
|
Ameya Shenoy
|
83fd31973f
|
Merge branch 'hotfix'
|
2018-10-23 07:58:12 +00:00 |
|
Ameya Shenoy
|
ac64b39562
|
bumped to version 10.1.63
|
2018-10-23 07:58:11 +00:00 |
|
Ameya Shenoy
|
c73c576536
|
Merge pull request #15759 from codingCoffee/salesperson
fix(): fetch correct warehouse for item in report
|
2018-10-23 13:25:42 +05:30 |
|
Shreya Shah
|
669c5d0298
|
Merge pull request #15724 from shreyashah115/fix-leave
Do not consider current leave application while submitting leave
|
2018-10-23 12:31:02 +05:30 |
|
Faris Ansari
|
d3e3c1ba72
|
Merge pull request #15768 from rohitwaghchaure/market_place_settings_error
[Fix] Marketplace settings permission error
|
2018-10-23 12:07:21 +05:30 |
|
Rohit Waghchaure
|
55416e08f1
|
[Fix] Marketplace setting permission error
|
2018-10-23 11:52:06 +05:30 |
|
Shreya
|
1b105e2575
|
Add test case
|
2018-10-23 11:45:57 +05:30 |
|
Shreya
|
60d8a0da1e
|
fix(leave-status): Do not consider current leave application while submitting
|
2018-10-23 11:45:57 +05:30 |
|
Shreya Shah
|
9db75ecde2
|
Merge pull request #15766 from Zlash65/fix-mod
[Minor] Travis fix
|
2018-10-23 11:44:33 +05:30 |
|
Zlash65
|
635d4dbebe
|
subscriber deprecated test case fixes
|
2018-10-23 11:00:19 +05:30 |
|