Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
36,281 Commits 3 Branches 0 Tags 1 GiB
10ec2eed6f
Commit Graph

110 Commits

Author SHA1 Message Date
Suraj Shetty
018ccc2b6d test: Fix test name 
- Rename TestSubcontractedItemToBeReceived > TestSubcontractedItemToBeTransferred
 2021-05-10 18:01:53 +05:30
hasnain2808@gmail.com
46d5f4c7f1 refactor(analytics report): linting 2020-12-25 16:34:43 +05:30
hasnain2808@gmail.com
9962ba86d0 fix: charts not displaying when tree_type changed 2020-12-16 14:41:04 +05:30
Anupam Kumar
31417864cb
fix: project value is missing from procurement-tracker (#23549) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-10-14 10:29:25 +05:30
marination
f90c3602a7 fix: Price should be total amount, modified deskpage 2020-10-01 14:38:17 +05:30
marination
59239172a1 feat: Supplier Quotation Comparison - v3 2020-09-14 17:34:21 +05:30
marination
bc6c4e864d fix: Status in Report and filter query 2020-08-31 20:32:17 +05:30
marination
8f452b8663 fix: Codacy and indicator message 2020-08-24 18:57:07 +05:30
marination
f49665077c feat: Quoted Item Comparison Report Enhancements v2 2020-08-24 18:26:48 +05:30
Marica
8ec4198af2
Merge branch 'develop' into club-mr-column 2020-07-20 16:07:10 +05:30
Afshan
0863beec92 created new report named "requested_items_to_order_and_receive" removed report "requested_items_to_order" also wrote a patch for deleting old report from table "tabReport" 2020-07-10 15:14:01 +05:30
Afshan
dca8a1d69d renamed "pending qty" to "qty to recieved" 2020-07-10 14:26:21 +05:30
Afshan
e3269039d3 feat: added columns to get complete analysis for material request 2020-07-07 18:01:37 +05:30
Deepesh Garg
3c63f5b76b Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts 2020-06-19 11:41:21 +05:30
Deepesh Garg
7e974c9e2c fix: Test Cases 2020-06-12 15:29:40 +05:30
marination
c0c455c471 fix: Procurement Tracker Data Consistency 2020-05-31 20:20:59 +05:30
Deepesh Garg
159d0734ef fix: Proccurement tracker report test 2020-05-30 11:47:22 +05:30
Deepesh Garg
1aec30d849 fix: Procurement Tracker test case 2020-05-30 11:47:04 +05:30
Deepesh Garg
c96bf870e4 fix: Test Cases 2020-05-30 11:46:39 +05:30
Deepesh Garg
36f7710356 Revert "fix: tests depending on global default company" 
This reverts commit 1f20c99ecf.
 2020-05-30 11:38:04 +05:30
Deepesh Garg
c897e800ed Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts 2020-05-29 11:04:20 +05:30
Marica
c2aabb0fbf
fix: Buying Module fixes (#21965) 
* fix: Buying Module fixes

* fix: Delete Report files as well

* fix: Add Purchase Order Analysis to Stock & Accounting
 2020-05-27 20:56:39 +05:30
Nabin Hait
e005078c0d feat: buying module dashboard and onboarding 2020-05-19 20:22:25 +05:30
marination
50d4bf578b fix: Date filters added to dashboards, number cards and minor fixes. 2020-05-19 17:02:47 +05:30
marination
75c65fd1b1 fix: Handle empty chart state and change desk dashboard 2020-05-15 23:47:51 +05:30
marination
a74d433cd8 fix: Fixed Dashboard Charts, modified fixtures and minor changes 2020-05-15 23:37:48 +05:30
marination
e46916be56 Merge branch 'develop' of https://github.com/frappe/erpnext into purchase-dashboard 2020-05-15 21:17:25 +05:30
marination
e4fc5ba83c fix: Report conditional query simplification. 2020-05-12 18:58:54 +05:30
Marica
c1a890a739
Merge branch 'develop' into quoted-item-report 2020-05-07 17:45:32 +05:30
marination
31a747b98a fix: Query enhancement, cleanup, added extra filter 
- Query changes as requested
- Moved chart generation from js to py
- Added Supplier Multiselect filter
 2020-05-07 17:38:00 +05:30
marination
cc989b62bd feat: Buying Desk, Dashboard and Reports 2020-05-05 23:58:08 +05:30
Nabin Hait
2305d00e0b
fix: Procurement tracker report (#21421) 
* fix: procurement report data was not coming

* fix: leave allocation minor issue
 2020-04-26 23:29:13 +05:30
marination
8890b6044d fix: Patch fix, Travis fix and cleanup 
- Added UOM column in Report
- Removed mandatory on `valid_till`
- Added list view indicator for Expired status in Supplier Quotation
- Sorted Labels in Chart and syntax cleanup
- Made labels Translatable
- Fixed patch
 2020-04-15 12:31:12 +05:30
marination
8179804405 refactor: Quoted Item Comparison Report 
- Refactored Report View
- Added Chart
- Added 'valid_till' date in Supplier Quotation
- Added patch to set valid_till and daily job to set expiry status
 2020-04-14 23:05:11 +05:30
Saqib Ansari
1f20c99ecf fix: tests depending on global default company 2020-04-14 19:40:25 +05:30
Rohit Waghchaure
07f3312804 fix: Procurement Tracker report not working 2020-02-06 14:34:11 +05:30
Aditya Hase
d1bb274c22 perf(tests): Use country with lesser fixtures 2019-07-26 05:54:04 +05:30
Mangesh-Khairnar
16a0458e29 fix(procurement-tracker): concatenate filter conditions with leading whitespaces (#18440) 2019-07-22 11:16:40 +05:30
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
Anurag Mishra
1a98cce3a4
Merge branch 'develop' into subs 2019-05-15 16:40:03 +05:30
Anurag Mishra
c3dcf02784 test: subcontracted raw materials to be recieved 2019-05-07 17:43:48 +05:30
Anurag Mishra
58bd2df834 fix: code refactor 2019-05-07 17:42:22 +05:30
Anurag Mishra
9acb2bf28f test: for subcontracting item be received 2019-05-07 14:38:30 +05:30
Mangesh-Khairnar
09d4933edb fix: filter pi item based on po completeion 2019-05-06 12:53:52 +05:30
Mangesh-Khairnar
e003cc8812 fix: filter out completed purchase receipt 2019-05-03 16:41:04 +05:30
Mangesh-Khairnar
13d393247a feat: add date range filters 2019-05-03 16:00:02 +05:30
Anurag Mishra
d0cdb4a1e9 feat: subcontracting report 2019-05-03 14:05:29 +05:30
Mangesh-Khairnar
cc8e2b6aca test: pass filters to execute 2019-05-01 10:03:57 +05:30
Mangesh-Khairnar
96661ba847 feat: add filters for multiple company operation 2019-04-28 17:11:28 +05:30
Mangesh-Khairnar
9cd9671bb5 fix: minor changes 2019-04-26 16:02:25 +05:30