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
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
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
rohitwaghchaure
cf076f4692
Merge pull request #15753 from Zlash65/fix-mod
...
[Minor] Field name fix to fetch Supplier
2018-10-23 09:45:39 +05:30
rohitwaghchaure
034429b34d
Merge pull request #15756 from rohitwaghchaure/fixed_allow_edit_rate
...
[Fix] User able to edit the rate in offline POS even if it has no permissions
2018-10-23 09:43:57 +05:30
Ameya Shenoy
a0e533ede5
Merge branch 'master' into staging-fixes
2018-10-22 10:37:14 +00:00
Ameya Shenoy
874866e9f9
Merge branch 'hotfix'
2018-10-22 10:34:35 +00:00
Ameya Shenoy
c365ce8f21
bumped to version 10.1.62
2018-10-22 10:34:35 +00:00
Ameya Shenoy
3a11f34355
fix(): fetch correct warehouse for item in report
...
Fix 'Sales Person-wise Transaction Summary' Report by fetching the
correct Warehouse for the Item fron the respective, Sales Order/Sales
Invoice/ Delivery Note
2018-10-22 10:15:07 +00:00
Nabin Hait
91eac5a7cf
fix(report): Optimization for financial statements
2018-10-22 15:05:40 +05:30
Rohit Waghchaure
aef7a6ec44
[Fix] User able to edit the rate in offline POS even if it has no permissions
2018-10-22 13:51:32 +05:30
Ranjith Kurungadam
ac6e3a69f9
fix: Serial No- allow editing SO, track changes ( #15741 )
2018-10-22 12:06:54 +05:30
Zlash65
473437931c
field name fix
2018-10-22 11:22:12 +05:30
Ameya Shenoy
4215b85e46
Merge branch 'staging-fixes' into staging
2018-10-19 12:56:48 +00:00
Ameya Shenoy
7e97230c92
bumped to version 11.0.3-beta.13
2018-10-19 12:56:48 +00:00
Ameya Shenoy
bbfdc13ab7
Merge branch 'master' into staging-fixes
2018-10-19 12:48:18 +00:00
Ameya Shenoy
6192d24235
Merge branch 'hotfix'
2018-10-19 12:48:17 +00:00
Ameya Shenoy
24fe7286fc
bumped to version 10.1.61
2018-10-19 12:48:16 +00:00
