Shreya Shah
e140845399
Revert "Add overdue status for sales order"
2018-10-31 18:20:28 +05:30
Shreya Shah
b95d7ae41b
Merge pull request #15870 from shreyashah115/portal-fixes
...
Add overdue status for sales order
2018-10-31 18:20:18 +05:30
Shreya
e3a7c68d4f
fix(portal): Add overdue status for sales order
2018-10-31 16:00:27 +05:30
Ameya Shenoy
df62296a26
Merge branch 'staging' into develop
2018-10-30 12:54:16 +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
1f7a5dcd07
bumped to version 10.1.65
2018-10-30 12:48:42 +00:00
Frappe PR Bot
467ff4f0f2
[Translation] Updated Translations ( #15852 )
2018-10-30 11:26:11 +05:30
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
69bbe1995c
Update production_analytics.py
2018-10-29 15:38:21 +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
Saurabh
6a916943aa
fix(P&L): sql query
2018-10-26 13:46:52 +00: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
c17a64758d
Merge branch 'staging' into develop
2018-10-23 12:58:06 +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
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
7658bdc00a
Merge branch 'staging' into develop
2018-10-23 08:06:15 +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
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
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
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
c1231d65fd
Merge branch 'staging' into develop
2018-10-19 13:27:07 +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
24fe7286fc
bumped to version 10.1.61
2018-10-19 12:48:16 +00:00
Nabin Hait
5d1171678e
fix(perpetual inventory): Get warehouse account map only if perpetual inventory enabled ( #15743 )
...
* fix(perpetual inventory): Get warehouse account map only if perpetual inventory enabled
* fix(perpetual inventory): Get warehouse account map only if perpetual inventory enabled
2018-10-19 18:03:13 +05:30
Kenneth Sequeira
991c121b57
added source link for ERPNext docs
2018-10-19 14:31:21 +05:30
Kenneth Sequeira
23ec18e3e4
added docs_app variable to point docs to foundation app
2018-10-19 03:28:12 +05:30
Saif
b4cf72c770
Adding "Include UOM" in Reports with Qty and Rates ( #15541 )
...
* Added Include UOM field for Stock Balane, Stock Ledger and Stock Projected Qty
* Add columns in result list-of-lists instead of converting reports to list-of-dicts
* For requested changes
-Merged conversion factor query with item detail queries
-Ensuring snail_case
-Made columns consistently list-of-dicts
2018-10-18 17:59:47 +05:30
Saif
3c9155e406
[Minor Fix] Force toggle display Net Total field when default taxes are fetched ( #15532 )
...
* Minor fix for the problem that Net Total, Net Rate, Net Amount field would not be shown when default taxes were fetched
* Prevent net_rate from becoming NaN
* -Fixed problem that party_account_currency was not set in mapped document
-Fixed problem that discount amount was not recalculated (in mapped document)
-Fixed problem that set_dynamic_fields would work only on certain condition that led to showing Total (Company Currency) field even when using company currency
2018-10-18 17:57:56 +05:30
