Commit Graph

282 Commits

Author SHA1 Message Date
Saif Ur Rehman
7129231dbb fix(Product Bundle Balance): Update frappe.db.escape for v12 2019-05-30 13:55:32 +05:00
Deepesh Garg
12a9a3ffa3
Merge branch 'develop' into Product-Bundle-Balance 2019-05-29 18:23:21 +05:30
Anurag Mishra
a69f72988a fix: requested filters changes 2019-05-28 11:08:14 +05:30
Anurag Mishra
61a7b42aea fix: added permission and fix filters in stock balance report 2019-05-27 18:37:04 +05:30
Anurag Mishra
7376b4f4f0 feat: added warehouse type master 2019-05-27 18:37:04 +05:30
Nabin Hait
99fa813799
Merge branch 'develop' into Product-Bundle-Balance 2019-05-27 14:01:00 +05:30
deepeshgarg007
6dfbd2bb64 fix: Delete old report 2019-05-01 14:17:16 +05:30
Saif Ur Rehman
f1da53ed01 fix(Product Bundle Balance): Remove custom roles 2019-04-25 00:14:14 +05:00
Saif Ur Rehman
a012b63f9b style: linting 2019-04-24 16:17:40 +05:00
Saif Ur Rehman
adc738f55d style: linting 2019-04-24 14:43:46 +05:00
Saif Ur Rehman
35887f1c0a feat: Product Bundle Balance Report 2019-04-24 13:37:25 +05:00
Nabin Hait
8bbc0a0c3b
Merge branch 'develop' into inactive_items 2019-04-23 18:38:44 +05:30
Deepesh Garg
cb2c13fa50
fix: Stock Ledger report fix (#17343) 2019-04-23 17:29:59 +05:30
deepeshgarg007
e3ea806390 fix: Ignore sql injections 2019-04-22 21:08:29 +05:30
deepeshgarg007
a89d1df655 fix: Typo fixes 2019-04-22 17:54:38 +05:30
deepeshgarg007
bf2adae97d fix: Ordering and datatype fixes in inactive items report 2019-04-22 17:15:23 +05:30
deepeshgarg007
767a00fa8d feat: Logic for query and report creation for inactive items 2019-04-18 08:45:10 +05:30
deepeshgarg007
4d1df416e9 fix: Reordered and deleted unnecessary filters 2019-04-18 08:29:21 +05:30
deepeshgarg007
cab2d82ea8 Merge branch 'develop' of https://github.com/frappe/erpnext into inactive_items 2019-04-17 11:35:56 +05:30
deepeshgarg007
508e815db0 feat: Added filters and columns for inactive items report 2019-04-16 17:07:13 +05:30
Mangesh-Khairnar
1934a76cd8 feat: Add status field in multiple reports linked with purchase order and sales order creation (#17107)
* enhancement: add status field in ordered itemd to be delivered

* enhancement: add status field in purchase order itemd to be received

* enhancement: add a status column in the billed reports
2019-04-08 16:29:59 +05:30
Nabin Hait
da7a193f11 fix(stock): Fixed stock balance and stock ledger report 2019-03-30 15:53:04 +05:30
rohitwaghchaure
fa638443bc
Merge pull request #16925 from rohitwaghchaure/stock_entry_enhancements
feat: stock entry enhancements
2019-03-26 22:50:54 +05:30
rohitwaghchaure
e196b3120e
Merge pull request #16961 from rohitwaghchaure/stock_ageing_warehouse_wise
feat: Stock ageing report warehouse wise
2019-03-26 16:21:17 +05:30
Rohit Waghchaure
5816fc2801 Renamed subcontract to Send to Subcontractor 2019-03-26 12:52:49 +05:30
Saurabh
3c95387926 Merge branch 'master' into develop 2019-03-20 14:39:49 +05:30
Rohit Waghchaure
ca9f93cdc2 feat: Stock ageing warehouse wise 2019-03-20 02:14:54 +05:30
Rushabh Mehta
957a3307ae
Merge pull request #16634 from Alchez/hotfix-stock-balance-balance
fix(stock_balance): Make balance qty and value columns more visible in the Stock Balance report
2019-03-15 09:02:20 +05:30
Rohit Waghchaure
267723f57b fix: stock ledgre report not working 2019-03-11 14:06:00 +05:30
Jay Parikh
9757a603fa Fix Company Default to Total Stock Summary Report 2019-03-06 12:44:41 +00:00
Rohan Bansal
e66f59654e fix(report): Incorrectdata for balance quantity and value in Stock Balance report 2019-03-06 16:04:11 +05:30
Frappe Bot
74fd5daeb2 Merge branch 'master' into develop 2019-02-15 10:22:33 +00:00
Deepesh Garg
4d1bc0ca85 fix: Add total row in analytics report (#16648) 2019-02-13 16:58:46 +05:30
Sagar Vora
551f52fd25 Merge branch 'master' into develop 2019-02-12 16:41:24 +05:30
Rohan Bansal
d635f722fc fix(stock_balance): Make balance qty and value columns more visible 2019-02-11 15:22:01 +05:30
Nabin Hait
9ea19b8fe1 fix: Fixed error on stock balance report 2019-01-31 15:53:25 +05:30
Sagar Vora
f97c5dad82 Merge branch 'staging' into develop 2019-01-29 18:39:14 +05:30
Nabin Hait
1187d61b56 fix(stock): Escaping issue in stock ledger report 2019-01-25 17:07:29 +05:30
Aditya Hase
0c16424d7d fix(naming): Use creation instead of name to order SLEs 2019-01-08 00:09:36 +05:30
Frappe Bot
9e09b3adbe Merge branch 'staging' into develop 2018-12-26 12:16:20 +00:00
rohitwaghchaure
53a38e8edc
Merge pull request #16257 from surajshetty3416/permission-fixes
Fix user permission checks
2018-12-26 14:49:01 +05:30
rohitwaghchaure
1c1798c7f2 [Fix] Warehouse wise item balance age and value report not working (#16258) 2018-12-24 14:19:27 +05:30
Suraj Shetty
7ed37ae6c3 Commonify code
- use get_permitted_documents function to avoid code redundancy
2018-12-19 19:56:42 +05:30
Suraj Shetty
7ae2d59ffd
Merge branch 'staging-fixes' into permission-fixes 2018-12-18 15:41:03 +05:30
Suraj Shetty
07e5786e1b Fix user permission checks 2018-12-10 19:10:18 +05:30
Frappe Bot
7c2a5bddb1 Merge branch 'staging' into develop 2018-12-06 09:50:25 +00:00
deepeshgarg007
94a3539015 Row check fix in stock analytics 2018-11-30 16:20:48 +05:30
deepeshgarg007
1a1c013b2a Analytics report bug fixes and code cleaning 2018-11-29 08:34:47 +05:30
Ameya Shenoy
fe1f532bc0
Merge branch 'staging' into develop 2018-11-28 08:28:37 +00:00
deepeshgarg007
05c2989698 removed total from graph 2018-11-26 20:19:57 +05:30