Abhishek Balam
72450d2af3
add revenue if within date range
2020-06-12 11:07:57 +05:30
Abhishek Balam
f596b5950e
indent to tabs
2020-06-12 11:07:28 +05:30
Deepesh Garg
fecac677ec
Merge pull request #22075 from abhishekbalam/fix-customer-count
...
fix(Accounts): Customer Count in Customer Acq. Report wrong
2020-06-02 00:09:01 +05:30
Abhishek Balam
192d4c8810
indent to tabs instead of spaces
2020-06-01 23:58:05 +05:30
Abhishek Balam
732f5c1867
fixed customer count logic
2020-06-01 23:51:39 +05:30
Deepesh Garg
12a9328a63
Merge pull request #21668 from abhishekbalam/develop
...
feat(Selling): Territory Wise Treeview In 'Customer Acquisition and Loyalty' Report
2020-05-13 14:26:40 +05:30
Abhishek Balam
411b125906
new parent updating logic, made requested changes
2020-05-12 15:25:35 +05:30
Abhishek Balam
87776c335b
code improvements
2020-05-11 15:18:40 +05:30
Abhishek Balam
500dff63e7
fix: adjusted width of colums to see full column names, also fixes #21556
2020-05-10 14:53:59 +05:30
Abhishek Balam
5ec5584319
In treeview, bold only for root territory, looks cleaner
2020-05-10 00:24:43 +05:30
Abhishek Balam
7cbc902d90
removed validation for root node in territory, codacy recommended changed
2020-05-09 22:35:28 +05:30
Abhishek Balam
b59f2780eb
fix: renamed view types, added default
2020-05-09 22:09:02 +05:30
Abhishek Balam
d543830a59
feat(Selling): Added Territory wise treeview to 'Customer Acquistion and Loyalty' report
2020-05-09 21:56:53 +05:30
Deepesh Garg
88e6f72cad
Merge branch 'develop' into sales-report-total-row
2020-05-06 10:48:21 +05:30
Saqib Ansari
52cc6ad456
fix: test
2020-05-04 20:24:00 +05:30
Saqib Ansari
ab9bb08c4b
fix: test
2020-05-03 14:53:13 +05:30
Saqib Ansari
826b39559d
fix: review fixes
2020-05-02 19:50:45 +05:30
Saqib Ansari
971170c590
fix: incorrect total in sales analytics for customer/item group
2020-05-02 19:39:03 +05:30
Saqib Ansari
dfa60e0ed8
chore: calculate total row month-wise in sales analytics
2020-04-30 20:06:30 +05:30
Saqib Ansari
10d9974e77
chore: add total row in sales analytics report
2020-04-30 16:28:52 +05:30
Deepesh Garg
8113294d6e
fix: Remove print
2020-04-29 22:16:47 +05:30
Deepesh Garg
0a6450115f
fix: get_period_list API change fixes
2020-04-29 22:14:45 +05:30
Shivam Mishra
55baccd63a
fix: specify column width
2020-04-22 11:50:06 +05:30
rohitwaghchaure
e4fecd725d
Merge pull request #21144 from anupamvs/year-sum-fix
...
Sum of years not needed.
2020-04-02 12:01:17 +05:30
Anupam K
b20dbff726
Sum of years not needed.
2020-04-02 11:37:44 +05:30
Anupam K
e48bcb30e7
Sum of years not needed.
2020-04-02 01:04:01 +05:30
Anupam K
85aae7de0b
bug: Item-wise Sales History - Billed amount
2020-03-28 14:13:58 +05:30
Deepesh Garg
cf8e2732c9
Merge pull request #20428 from 0Pranav/territory-sales-pipeline
...
feat: add territory wise sales report
2020-02-06 13:11:07 +05:30
Deepesh Garg
da406d74ef
fix: Remove debug param
2020-02-06 12:55:21 +05:30
Deepesh Garg
a4928f6f5b
fix: Add report link in module view and fix date filter
2020-02-06 12:50:25 +05:30
0Pranav
9d9a3d85d8
fix: filters after rename
2020-02-05 14:17:21 +05:30
0Pranav
9c4399e1f2
fix: better syntax for checking empty arrays
2020-02-03 14:57:42 +05:30
0Pranav
b1473c3de0
fix: return empty array
2020-01-31 10:43:00 +05:30
0Pranav
75adb808e5
various fixes from review
...
- Rename the report to title case
- Added company filter
- fixed checks in filter and += operator for total
2020-01-31 10:35:47 +05:30
Suraj Shetty
48e9bc3fc9
fix: Incorrect translation syntax
2020-01-29 15:06:18 +05:30
0Pranav
6280609c25
enhancement: add territory wise sales report
2020-01-14 15:53:35 +05:30
rohitwaghchaure
c58495dcee
fix: Item-wise Sales History report not working ( #19889 )
2019-12-10 21:34:03 +05:30
deepeshgarg007
f89b172202
fix: Available stock for packing item report
2019-12-01 21:53:32 +05:30
Mangesh-Khairnar
2f44480d69
enhancement: Item-wise sales history report ( #19500 )
...
* refactor(item-wise-sales-history): convert query report to script report
* refactor: add columns, fetch data
* refactor: shift company set func to utils
* fix: add filters
* fix: minor changes
* fix: fetch all the descendants
2019-11-11 10:54:12 +05:30
deepeshgarg007
683a89a415
fix: Chart fix in Analytics report
2019-10-12 23:02:53 +05:30
Mangesh-Khairnar
5dcf2c669f
chore: remove unlinked letter head references ( #19138 )
2019-09-24 09:53:06 +05:30
Marica
cef75a5987
fix: Customer Credit Balance Report query fix ( #19105 )
2019-09-18 20:00:39 +05:30
Nabin Hait
b847731482
Merge branch 'feat-customer-credit-limit' of https://github.com/Mangesh-Khairnar/erpnext into Mangesh-Khairnar-feat-customer-credit-limit
2019-09-05 16:47:08 +05:30
Deepesh Garg
cffe577028
fix: Add UOM in anlytics report when viewing based on item ( #18902 )
2019-09-05 16:03:15 +05:30
Anurag Mishra
867ac10ffd
fix: handle for product bundle ( #18420 )
...
* fix: handle for product bundle
* fix: Requested changes and some general fixes
2019-09-05 15:13:21 +05:30
Nabin Hait
c78c86663d
Update customer_credit_balance.py
2019-09-05 12:24:37 +05:30
Mangesh-Khairnar
5755d2d32f
fix: customer credit limit report
2019-08-29 19:51:38 +05:30
Suraj Shetty
06b56adc71
Merge branch 'develop' into develop-customer-item-price-report
2019-07-17 17:29:42 +05:30
deepeshgarg007
8cbc22062b
fix: Remove cost center filter from customer credit balance report
2019-07-15 18:35:19 +05:30
deepeshgarg007
ad4c111d91
fix: Remove cost center filter from customer credit balance report
2019-07-15 18:32:10 +05:30
deepeshgarg007
f7395916c8
fix: Accounting Dimensions in Customer Credit Balance report
2019-07-14 18:44:32 +05:30
deepeshgarg007
a85db66146
fix: Usability fixes in accounting dimensions
2019-07-14 18:15:19 +05:30
Don-Leopardo
93fbba4f40
Merge branch 'develop' into sales_analytics_with_order_type_develop
2019-07-10 10:52:55 -03:00
Nabin Hait
34c551d9a5
fix: Missing commits from hotfix branch ( #17997 )
...
* fix: merge conflict
* fix: restored missing set_gst_state_and_state_number function
* fix: style linting as per codacy
* fix: Fixes related to customer/lead merging
* fix: merge conflict
* fix: Fixes related to customer/lead merging
* fix: Assign isue/opportunity to user
* fix: Assign isue/opportunity to user
* fix: Replaced Invoice type by GST Category
* fix: merge conflict
* fix: merge conflict
* fix: test cases
* fix: test cases
2019-07-03 10:34:31 +05:30
NahuelOperto
42fe68d065
feat: order type in trr type filter
2019-06-24 08:29:14 -03:00
Rohan Bansal
0426636a32
fix(customer): Improve performance by reducing queries
2019-06-17 12:16:12 +05:30
Rohan Bansal
e3a3306b30
feat(customer): Add report to show item prices per Customer
2019-06-13 14:53:33 +05:30
Rohan Bansal
250734dd24
fix(selling): Remove Totals row for tree-based Sales Analytics
2019-05-30 17:30:50 +05:30
Rohit Waghchaure
34ee41a35e
fix: Pending SO Items For Purchase Request not showing the so quantity correctly if so has duplicate items
2019-04-16 18:26:11 +05:30
Rohit Waghchaure
4ae221946b
renamed report
2019-03-26 11:14:06 +05:30
Rohit Waghchaure
1c1d0bb1c7
feat: commonified item group wise target variance report
2019-03-25 17:56:43 +05:30
Rohit Waghchaure
65d9435fd5
feat: sales partner reports
2019-03-20 12:05:21 +05:30
Rohit Waghchaure
ace95d5a67
feat: added cost center filter in AR/AP reports
2019-03-18 12:21:00 +05:30
Frappe Bot
7e67a400cd
Merge branch 'master' into develop
2019-03-08 09:39:33 +00:00
Deepesh Garg
e1f72cc010
revert: Address and contact report fix ( #16786 )
...
Reverts #16674
Address and other info are not visible in address and contact report
![screenshot 2019-02-27 at 11 31 38 am](https://user-images.githubusercontent.com/42651287/53469309-6029f500-3a83-11e9-9672-e5e7d14dc470.png )
2019-03-04 12:49:39 +05:30
Sagar Vora
e0eafb1c2c
Merge branch 'master' into develop
2019-02-26 17:08:59 +05:30
deepeshgarg007
d2d84e3c9d
fix: Company filter fix
2019-02-26 11:52:22 +05:30
Frappe Bot
74fd5daeb2
Merge branch 'master' into develop
2019-02-15 10:22:33 +00:00
deepeshgarg007
34f4f24e21
fix: Address and contact report
2019-02-14 17:26:49 +05:30
Deepesh Garg
4d1bc0ca85
fix: Add total row in analytics report ( #16648 )
2019-02-13 16:58:46 +05:30
Sagar Vora
f97c5dad82
Merge branch 'staging' into develop
2019-01-29 18:39:14 +05:30
Aditya Hase
f3c22f342c
fix(unicode): Import unicode_literals in every file
2019-01-22 18:36:10 +05:30
Nabin Hait
bef2c22d23
Fix: merge conflict
2019-01-18 10:15:47 +05:30
Nabin Hait
c693cd7f10
Merge pull request #16341 from Mangesh-Khairnar/date-range-fix
...
fix: Sales Analytics Period Range
2019-01-10 10:35:31 +05:30
Saurabh
afec3ca89a
Merge branch 'staging' into develop
2019-01-08 17:09:36 +05:30
Mangesh-Khairnar
e2ea987610
fixed edge cases for yearly, weekly and monthly views
2019-01-05 00:15:31 +05:30
Mangesh-Khairnar
676a106d7a
(refactor) removed unnecessary code
2019-01-05 00:15:31 +05:30
Mangesh-Khairnar
8e47a543f6
(fix) multiple years in yearly view
2019-01-05 00:15:31 +05:30
deepeshgarg007
32f054b901
Added customer group column in item-wise-sales-history report
2019-01-03 22:57:18 +05:30
Frappe Bot
9e09b3adbe
Merge branch 'staging' into develop
2018-12-26 12:16:20 +00:00
Mangesh-Khairnar
70c5aa5f5d
[Enhancement] Pending SO Items for Purchase Request Report ( #16188 )
...
* deleted old purchase request query report
* [Enhancement] pending so items for purchase request report refactor
* comments and format fix
* test and minor fixes
* test fixes
2018-12-24 14:25:47 +05:30
Frappe Bot
1b7c583c48
Merge branch 'staging' into develop
2018-12-21 05:46:23 +00:00
deepeshgarg007
1ee19e4167
Analytics report graph fix
2018-12-15 15:36:09 +05:30
Frappe Bot
7c2a5bddb1
Merge branch 'staging' into develop
2018-12-06 09:50:25 +00:00
deepeshgarg007
37b6a2ca0b
row check bug fix
2018-11-30 16:15:43 +05:30
deepeshgarg007
3c7c4a61be
Test case fix
2018-11-29 14:28:01 +05:30
deepeshgarg007
3eef6411dd
Removed print statement
2018-11-29 13:10:02 +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
Nabin Hait
d0af0887be
Merge pull request #16051 from SaiFi0102/patch-1
...
Remove "Test" Letter Head
2018-11-26 19:47:07 +05:30
Nabin Hait
48e0e19b03
fix(test): Fixed salary slip and sales analytics test cases
2018-11-26 11:05:28 +05:30
deepeshgarg007
9cdece4ca2
Test case fix and other minor bug fix
2018-11-26 11:05:28 +05:30
Saif
2a2f2742eb
Remove "Test" Letter Head
2018-11-21 23:29:09 +05:00
Frappe Bot
b5c7b96a73
Merge branch 'staging' into develop
2018-11-13 11:33:31 +00:00
Deepesh Garg
6714214951
Server side script report for sales analytics ( #15589 )
...
* Sales Analytics Report
* Codacy issue fixes and name column addition
* Minor Fixes
* Minor Changes
* Codacy Issue Fixes
* Codacy Issue Fixes
* Bug Fixes
* Code cleaning and optimization
* Deleted Duplicate code
* Indentation Issue Fixes
* Added Supplier Condition
* Cleaned code and better function naming
* Added report link for sales analytics in selling.py
* fix(patch): Patch to delete old analytics reports
* feat(refactor): Created class and refactored code using object oriented paradigm
* Column condition fix
* Minor condition fix
* Minor fix
* parent child map for purchase analytics
* Minor Fixes in get_periodic_data
* Used dots for filters instead of brackets
* Minor Bug fix in get_period_date_ranges
* Test Cases for Analytics Report
2018-11-12 16:15:54 +05:30
Ameya Shenoy
7658bdc00a
Merge branch 'staging' into develop
2018-10-23 08:06:15 +00:00
Ameya Shenoy
ca66c7ba14
Merge branch 'master' into staging-fixes
2018-10-23 08:01:13 +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
Ameya Shenoy
d1c467bcf5
Merge branch 'staging' into develop
2018-10-17 09:44:39 +00:00
deepeshgarg007
4bb90add1d
Currency symbol bug fix ( #15698 )
2018-10-15 19:07:49 +05:30
deepeshgarg007
7c443264a4
Currency symbol bug fix ( #15690 )
2018-10-15 18:22:28 +05:30
Ameya Shenoy
f90af80344
Merge branch 'staging' into develop
2018-10-11 06:58:53 +00:00
deepeshgarg007
1cb1074f6b
Bug Fix ( #15640 )
2018-10-10 16:15:30 +05:30
Ameya Shenoy
da10f6ebd8
Merge branch 'staging' into develop
2018-10-04 11:51:30 +00:00
Sharath C
1c44d93b93
Is frozen and Disabled Columns added to Customer Credit Report ( #15560 )
2018-10-03 10:41:11 +05:30
deepeshgarg007
719701f2a4
Enhancement in Budget Variance and other reports ( #15455 )
...
* Enhanced Budget Variance report and added filters and columns in other reports
* Update budget_variance_report.js
* Changes in budget variance report
* Spacing in column names
2018-10-02 12:52:13 +05:30
Charles-Henri Decultot
4fd7a4e0d7
Lead notes ( #15510 )
...
* Notes field in Lead
* Add notes to lead details report
2018-09-30 21:20:55 +05:30
deepeshgarg007
86152eb5c8
Sales person Commission Report and more ( #15431 )
...
* Commission For Sales Person
* Changes Made
* Changes made in sales person dashboard and commission report
* Update sales_person_commission_summary.py
2018-09-25 19:08:16 +05:30
Faris Ansari
9e874af9ba
Query report print ( #14935 )
...
* QueryReport
- Only print visible columns in report
- Use get_columns_for_print method instead of directly
accessing report.columns
* Query Report
- Replace frappe.query_report_filters_by_name with new API
2018-07-18 09:28:44 +05:30
Saurabh
db7324890f
Merge branch 'master' into develop
2018-07-09 15:53:51 +05:30
rohitwaghchaure
6be8bea934
Provision to view return entries in Sales Person-wise Transaction Summary ( #14830 )
2018-07-08 19:25:13 +05:30
Zarrar
e25dcd2737
[Minor] Report related fixes ( #14620 )
...
* fix in query incase list is empty
* periodicity not found error
when called from consolidated financial statements and custom cash flow is activated
* unset currency filter to apply default currency or so
* python 2 - 3 fix
2018-06-21 10:53:12 +05:30
Saurabh
59798b4e88
resolved merge conflict
2018-06-20 15:23:25 +05:30
Nabin Hait
8eeb5694ba
Fixed qty in item-wise sales history report
2018-06-18 17:41:27 +05:30
Shreya Shah
5103454642
New Report Address and Contacts ( #14307 )
...
* New Report Address and Contacts
* Fix codacy
* Add links to report in module pages
2018-06-05 10:44:36 +05:30
Saurabh
0eb622f7da
[fix] resolve conflicts
2018-05-31 17:32:17 +05:30
Zarrar
39c0add5a2
query fix sales-person-target-variance-item-group-wise ( #14271 )
2018-05-30 11:56:58 +05:30
Ameya Shenoy
1cc7500be9
Merge branch 'master' into develop
2018-05-22 09:18:38 +00:00
Nabin Hait
19ce904030
Report added in Selling module
2018-05-21 11:07:04 +05:30
Nabin Hait
2cfc247d88
customers without any sales transactions
2018-05-21 11:03:02 +05:30
Basawaraj
6d334b8135
Added Report : Customers Without Any Sales Transactions
2018-05-17 16:54:03 +05:30
Shreya Shah
4f40b2dca5
[Fix] Sales Person Reports ( #13987 )
...
* Fix Sales Person Reports
- Show quantity and amounts based on the delivered quantities if the Sales Order has been closed and all quantities weren't considered for further transactions.
* Fix codacy
* Modify as per the review comment
2018-05-16 11:22:59 +05:30
Achilles Rasquinha
96698c9a77
Use range instead xrange ( #13128 )
...
* Use range instead of xrange
* convert float to int
2018-02-28 16:12:51 +05:30
Shreya Shah
8a77a0e1e4
Add total row in all trends reports ( #13010 )
...
* total in sales order trends report
* total in all trends reports
2018-02-21 14:46:07 +05:30
Shreya Shah
5448318146
fix total field ( #12992 )
2018-02-19 12:44:52 +05:30
rohitwaghchaure
5b45bcf5f3
[Fix] Report Available Stock for Packing Items Menu not working ( #12400 )
2018-01-11 12:39:09 +05:30
Nabin Hait
68768252ce
Cleanup and fixes on bypass credit limit check on sales order
2017-11-23 17:48:59 +05:30
ashish
604eb9d689
added flag to function get_customer_outstanding and removed names in comments
2017-11-16 11:05:59 +05:30
ashish
fb364df091
customer_credit_balance.py -- Credit limit should now reflect outstanding amount for each customer based on value of flage bypass credit limit check at sales order level. A new column is added to show the value of this flag. customer.py -- get_credit_limit function which gets called by the above customer_credit_balance report is updated to deduct the amount of sales order for which credit limit bypass flag is set
2017-10-25 16:17:55 +05:30
Faris Ansari
ab74ca7fff
Lint and fix JS files
2017-05-30 12:54:42 +05:30
Nabin Hait
b3ffd6b282
Merge pull request #7828 from rohitwaghchaure/update_user_roles_to_roles
...
Changed userrole to has role, commonify role editor of the user
2017-03-06 18:44:53 +05:30
Nabin Hait
e68f32cf19
UOM Conversion in selling
2017-03-06 16:41:13 +05:30
Kanchan Chauhan
5a980ac87a
UOM Conversion in Selling
2017-03-06 16:41:12 +05:30
Rohit Waghchaure
e7485150a1
added roles in the report
2017-03-06 14:26:09 +05:30
mbauskar
cbc49e2989
[WIP] Address and Contact Fixes
2017-01-30 10:45:28 +05:30
Kanchan Chauhan
b7cc393eb8
Email ID renamed to Email Address
2017-01-03 16:45:38 +05:30
Nabin Hait
219148d23d
Sales Personwise transaction summary - total row
2016-10-05 12:26:51 +05:30
Rushabh Mehta
be2ee18de4
[fixed] frappe.require is now async 💥
2016-04-29 17:22:42 +05:30
Nabin Hait
9fef3df6a0
[fix] Fixed pending so items for material request report
2016-04-12 18:46:47 +05:30
Nabin Hait
4f10f15686
[fix] Modified date changed in query report due to project field renaming
2016-04-01 17:59:06 +05:30
Nabin Hait
2a5c1138a0
Merge pull request #4944 from rmehta/modules-redesign
...
[redesign] modules
2016-03-16 14:35:11 +05:30
Neil Trini Lasrado
6e343e23d9
Renamed project_name to project
2016-03-15 17:50:53 +05:30
Rushabh Mehta
d1e1c52171
[redesign] modules
2016-03-08 18:07:20 +05:30
Neil Trini Lasrado
abd9248ba6
Rename sales_order_no to sales_order in Material Request Item
2016-02-23 18:35:43 +05:30
Nabin Hait
8a59c33e2f
[fix] Sales Person target variance report: based on lft and rgt of item group
2016-02-23 15:23:24 +05:30
ShashaQin
e7dccca782
Update item_wise_sales_history.json
2016-02-04 16:44:18 +08:00
shreyas
1a943151d7
[Refactor/Cleanup] Cleaned debug print statement
...
Refactored code to use format() instead of string formatting using %s
2016-01-29 15:41:45 +05:30
shreyas
c761f1b0a1
[Minor] Cleanup
2016-01-29 15:41:44 +05:30
shreyas
e970ddcee9
[Fix]
...
1. Sales Person wise transaction report
2. Sales Person wise target variance report
3. Sales order trend report generation for selection in group by feild
2016-01-29 15:41:44 +05:30