Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
26,080 Commits 3 Branches 0 Tags 1 GiB
cab2d82ea8
Commit Graph

264 Commits

Author SHA1 Message Date
rohitwaghchaure
0aeeb7e02c [Fix] Item variant details report (#12869) 2018-02-12 11:44:39 +05:30
Nabin Hait
2ef1f84041 Fixed merge conflict 2018-02-03 09:14:53 +05:30
Nabin Hait
b9ce104b09
Opening balance in stock ledger report (#12729) 2018-02-01 14:58:50 +05:30
Saurabh
fb2f97391f resolved merge conflicts 2018-01-24 11:24:10 +05:30
Saurabh
4b9a55b0ef [fix] If buying or selling price list not found, return empty dict 2018-01-24 07:48:56 +05:30
umaepoch
832453a757 Added Delay days field to Ordered Items to be Delivered report (#12439) 
* Added Delay Days to Ordered Items to be Delivered Report

* Ordered Items to be Delivered
 2018-01-15 15:43:16 +05:30
Saurabh
35d8ce4fbd resolved merge conflicts 2018-01-12 16:58:32 +05:30
rohitwaghchaure
752d21e658 Code cleanup for item price stock report and fix report was not exporting properly in excel (#12427) 2018-01-11 12:28:48 +05:30
Nabin Hait
07e5376043 Fixes and cleanups of reserve qty for subcontracting 2018-01-05 18:19:59 +05:30
Nabin Hait
28d0230e56 Multiple small fixes 2018-01-05 13:14:25 +05:30
Pawan Mehta
bb7fab52d1 [fix] #11880- Item wise report showing price list and stock available (#11885) 
* [fix] #11880

* review comments

* codacy fixes
 2017-12-12 15:05:03 +05:30
Prateeksha Singh
744ff0010b Variant report (#11618) 
* Item Variant Details Report

* remove queries from inside for loop

* make attribute value map

* Update item_variant_details.py
 2017-11-17 12:00:29 +05:30
Nabin Hait
78ab8235f6 Minor code cleanups in stock balance report 2017-11-15 14:43:54 +05:30
Brown-Harry Boma
b9e44217a2 [Fix]Codacy Issues 2017-11-15 14:43:54 +05:30
Brown-Harry Boma
2da8f6e89d Add Items Variants Attributes columns to Stock Balance Report 2017-11-15 14:43:54 +05:30
Nabin Hait
15753074bf
Nestedset model fixes for changing parent and renaming (#11467) 2017-11-10 11:12:43 +05:30
Utkarsh Goswami
11bd5fc3b1 Description moved next to item code (#10820) 2017-09-18 15:05:50 +05:30
mbauskar
62f0722325 resolved merge conflicts 2017-08-21 08:58:42 +05:30
Makarand Bauskar
222e86bb13 [hotfix] fixed the mysql syntax error issue on stock ledger report (#10442) 2017-08-21 07:35:16 +05:30
Manas Solanki
0371d5a326 new item group filter in the stock ledger report (#10400) 2017-08-16 11:35:04 +05:30
tunde
80a9f37272 add options in get_columns 2017-08-04 12:08:09 +01:00
Makarand Bauskar
9c6e2c3637 [hotfix] included the get_purchase_trends_filters instead of get_sales_trends_filters in Purchase Receipts trends (#10127) 2017-07-27 16:23:57 +05:30
Makarand Bauskar
dfc5a454b3 [minor] fixed the delivery date issue in Ordered Item to be Dellivered report (#10028) 2017-07-25 10:48:43 +05:30
Nabin Hait
3020c8086c Update stock_balance.py 2017-07-18 11:17:32 +05:30
pawan
36025468a1 [fix] #9899 2017-07-17 17:28:44 +05:30
Doridel Cahanap
5ad4a6e161 Total Stock Summary (#9465) 
* Total Stock Summary

* indentation fixes and removed the for loop

* minor fixes in total stock summery report
 2017-07-05 10:49:09 +05:30
Vishal Dhayagude
310d4dc9e0 UOM column in Batch Wise Balance History Report (#9359) 
* Training Events/Results link to employee dashbord

* [minor]Improve validation message for Buying / Selling Setting

* [minor]Added UOM cloumn in Batch Wise Balance History Report

* modified validation message for buying / selling setting
 2017-06-20 13:02:35 +05:30
Sagar Vora
489ab6d70d [minor] remove hardcoded flt precision and use system default (#9250) 
* possible fix

* use system default precision for flt
 2017-06-13 18:58:47 +05:30
Faris Ansari
ab74ca7fff Lint and fix JS files 2017-05-30 12:54:42 +05:30
mbauskar
1b6270ef40 [hotfix] error while sending the auto email report of Ordered Items To Be Delivered 2017-04-28 14:35:18 +05:30
Rushabh Mehta
e385b5b97b [enhance] automatic batch creation, move and split 2017-04-24 10:28:38 +05:30
mbauskar
cca55ddc33 [minor][hot] fixes for KeyError: from_date for stock balance report 2017-04-14 14:54:11 +05:30
Nabin Hait
f912317fae Stock Balance: Show records based on all child item groups if filters set based on group node 2017-03-29 18:08:10 +05:30
Nabin Hait
e2fef16d78 Made join_table query optional based on item group filter 2017-03-29 17:51:05 +05:30
Javier Wong
41bf1ba7b3 [enhancement] Stock Balance Report - Added Item Group Filter 2017-03-29 17:51:05 +05:30
Rohit Waghchaure
e7485150a1 added roles in the report 2017-03-06 14:26:09 +05:30
Kanchan Chauhan
79cd59303a [Fix] Serial No Status 2017-02-14 12:49:36 +05:30
Nabin Hait
b251cd4ccb Fixed merge conflict 2017-01-13 14:34:54 +05:30
Nabin Hait
5dd988207f Show values based on precision and filter out zero value rows 2017-01-10 16:10:40 +05:30
Revant Nandgaonkar
00e65cb70b Report - Batch Item Expiry Status 
Changed column name `Expiry Status` to `Expiry (In Days)`
Changed column type from Data to Int
 2016-12-21 14:21:53 +05:30
Revant Nandgaonkar
0766d3e67e Report : Batch Item Expiry Status 
Select From Date and To Date
Lists Items about to expire or already expired
Expiry Status column shows number of days in which item/batch will expire
 2016-12-21 12:32:12 +05:30
Nabin Hait
5c18bd9b61 Fixed merge conflict 2016-12-06 16:16:58 +05:30
Rohit Waghchaure
36a01d3464 [Enhancement] Total row added for report builder 2016-12-05 18:59:59 +05:30
Rushabh Mehta
4bfa0748cd [merge] master 2016-11-16 11:28:23 +05:30
Shreyas Patil
99a3593a0d [Fix] Make from_date and to_date for stock balance query report as mandatory fields (#6948) 2016-11-16 11:16:44 +05:30
Manas Solanki
5bc4784bad Report: Bin - Item Shortage Report -- Should have Item Name and description #4946 
New report is build including two new column Item name and item description
 2016-11-01 18:07:12 +05:30
Kanchan Chauhan
9100322462 [Fix] Serial No report fixed for Creation No link 2016-10-31 16:01:09 +05:30
robert schouten
4fc70d962b add customer and supplier names to some reports 2016-09-12 15:23:51 +08:00
Saurabh
3642f987c7 [fix] report filter fix 2016-07-27 11:42:50 +05:30
Rushabh Mehta
528e145a54 [docs] fixes #5697 2016-07-14 17:00:05 +05:30
Rushabh Mehta
cca33b2ff0 [cleanup] 2016-07-11 13:01:58 +05:30
Rushabh Mehta
8c2e79cf0d [minor] fixes 2016-07-04 11:39:25 +05:30
Neil Trini Lasrado
b7ff027937 Added Safety Stock to Item Master 2016-06-27 17:45:08 +05:30
Saurabh
ce22d34fcf [fix] report Stock Projected Qty 2016-06-27 17:05:13 +05:30
Saurabh
4d02949814 [fixes] validate trash condition for warehouse and related account, move existing warehouses under all warehouse group, set account parent and is group for warehouse account 2016-06-25 11:06:14 +05:30
Saurabh
9c7b0079c5 [fixes] warehose group wise stock report and test cases for warehouse hierarchy and warehouse group wise reorder level 2016-06-25 11:06:13 +05:30
Rushabh Mehta
e9d2c3d46e [fix] report requested items to be transferred, fixes #5295 2016-06-08 16:41:09 +05:30
Rushabh Mehta
be2ee18de4 [fixed] frappe.require is now async 💥 2016-04-29 17:22:42 +05:30
Rushabh Mehta
0525387328 [enhancement] added reserved_qty_for_production in bin and updated item dashboard 2016-04-18 19:27:46 +05:30
Umair Sayyed
72534deea2 removed Is Sales Item and Is Purchase Item 2016-04-15 12:57:00 +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
4e78cee1c2 Merge pull request #4959 from ShashaQin/patch-37 
Improvements about Item Prices Report
 2016-03-17 18:13:09 +05:30
ShashaQin
769b01e07a Update item_prices.py 2016-03-16 16:37:28 +08:00
Neil Trini Lasrado
6e343e23d9 Renamed project_name to project 2016-03-15 17:50:53 +05:30
Nabin Hait
d1f85c4fe6 [fix] Item or Warehouse filter mandatory in Stock Balance if number of sle is greater than 500000 2016-03-14 14:59:21 +05:30
ShashaQin
e8d635827a Update item_prices.py 2016-03-10 14:55:06 +08:00
ShashaQin
c6b5f7dcae Update item_prices.py 2016-03-10 08:49:38 +08:00
Anand Doshi
0902fb2e3d [fix] Run Stock Balance report only after one of the filters is set 2016-03-07 13:11:59 +05:30
Nabin Hait
7736e092e7 Merge branch 'reorder_level_zero' of https://github.com/creador30/erpnext into creador30-reorder_level_zero 2016-02-22 16:19:33 +05:30
Nabin Hait
1a99cb8bfe [fix] Escaping strings with percentage 2016-02-19 12:45:57 +05:30
creador
e71fa9210f Allow reorder_level to be set to 0 
For items you don’t want to keep in stock, you can set the
reorder_level to 0 and define reorder_qty.

If there is e.g. a sales order for that item, the projected quantity
will fall below 0, which will trigger an automatic material request.
 2016-02-14 11:58:21 +02:00
Anand Doshi
4b249fe8ec [optimization] stock balance report - force index + improve memory usage 2016-02-11 20:38:01 +05:30
Rushabh Mehta
3cdf3544fb [enhancement] default warehouse not mandatory in time, re-order level and re-order qty must always be set per warehosue 2016-02-08 18:50:40 +05:30
Nabin Hait
4129ae5395 [fix] Translations in Stock balance report 2016-02-04 17:22:57 +05:30
Nabin Hait
3c55d89f7f [minor] Reference doctype in Item-wise price List Rate report 2016-02-01 15:55:09 +05:30
Nabin Hait
d35d74346d [fix] minor fix in stock projected qty 2016-01-04 16:16:49 +05:30
Nabin Hait
b6b56453e1 [fix] Get defaults based on doctype or fieldname 2015-12-23 16:37:06 +05:30
Giovanni Lion
5de53eb0eb Voucher dynamic link fix to allow links to work if user language is not english 2015-12-09 15:45:40 +08:00
Anand Doshi
602e8253be [enhancement] Int, Currency, Float, Percent as not null and default to 0 2015-11-19 13:23:36 +05:30
Saurabh
b7f0a4961e - no delivery / reserve warehouse in drop ship 
- “Re-open” in DN / PR after “Stop” / “Close"
- check for closed status in reports
 2015-11-04 12:03:54 +05:30
Anand Doshi
21e09a2bd8 [enhancement] Ability to disable an Item 2015-10-29 12:39:47 +05:30
Anand Doshi
b9bfe6117e [optimization] Stock Projected Qty report 2015-10-23 14:49:09 +05:30
Rushabh Mehta
5033e7b431 [hot] fix stock projected qty 2015-10-23 10:51:56 +05:30
Nabin Hait
398c83afa5 [fix] For Serial No Status 2015-10-22 15:11:44 +05:30
Rushabh Mehta
7f66983309 [minor] added column type definition in batch-wise balance history 2015-10-21 12:04:27 +05:30
Anand Doshi
7b2b0cd73c [fix] Item Re-order if Bin does not exists and fixed Stock Projected Qty report to show per Warehouse Re-order level 2015-10-20 14:29:47 +05:30
Nabin Hait
c865f229fb Target Warehouse in Delivery Note and Sales Invoice and removed Serial No status 2015-10-13 15:46:42 +05:30
Nabin Hait
5c66fb7631 Merge pull request #4130 from nabinhait/reports 
[fix][report] Left join used in pending reports
 2015-10-07 11:15:36 +05:30
Nabin Hait
8a7bdd5a92 [fix] Valuation Rate in Stock Balance report 2015-10-06 18:46:56 +05:30
Nabin Hait
f4edaef481 [fix][report] Left join used in pending reports 2015-10-06 12:48:04 +05:30
Rushabh Mehta
1e8025b327 [cleanup] yes/no selects changed to checks in Item 2015-07-29 11:38:33 +05:30
Neil Trini Lasrado
d0387f41df Opening Balance row added to Stock Ledger Report 2015-07-22 18:44:59 +05:30
Neil Trini Lasrado
ed8cecbdd8 Sales BOM renamed to Product Bundle 2015-07-13 12:41:27 +05:30
Nabin Hait
24efb3122a [fix] Hide zero balance rows in batch-wise balance history report 2015-07-03 15:20:14 +05:30
Nabin Hait
7ee45b4af2 [fix] Batch-wise balance history: show records only with batch-id 2015-06-18 15:29:14 +05:30
Rushabh Mehta
ed9d5cfdaf [minor] cleanup 2015-06-17 02:13:03 +05:30
Rushabh Mehta
bf4547ca5f [fix] dynamic link in BOM Search report 2015-06-17 02:12:06 +05:30
Rushabh Mehta
b45a6bcb88 [report] BOM Search 2015-06-17 01:54:56 +05:30
Nabin Hait
b937fac3ce [report] Warehouse column added in 'Ordered Items to be Delivered' report 2015-06-10 18:21:57 +05:30
Nabin Hait
1d08304ba5 added total row in stock balance report 2015-05-22 11:56:13 +05:30
Pratik Vyas
803e998e9d Fix merge mistakes 2015-05-19 13:08:54 +05:30
Pratik Vyas
1a84d8ecd2 Merge branch 'develop' 2015-05-19 12:23:52 +05:30
Nabin Hait
67fdbcf242 precision fixed in batch-wise balance report 2015-04-28 12:53:26 +05:30
Nabin Hait
5ce31174be precision fixed in batch-wise balance report 2015-04-28 12:36:53 +05:30
Nabin Hait
b650d691a0 fixed conflict 2015-04-21 17:16:28 +05:30
Nabin Hait
4642d0697e fixed conflict 2015-04-09 11:42:24 +05:30
Nabin Hait
0277ae298a pending amount to be delivered in report 2015-04-07 17:49:53 +05:30
Anand Doshi
22af7deadd minor fixes 2015-04-05 17:18:07 +05:30
Anand Doshi
6208c49859 Added Company field in various Query Reports 2015-03-30 15:21:20 +05:30
Nabin Hait
789ef7e346 stock balance report fixed 2015-03-26 17:40:57 +05:30
Nabin Hait
97cc4dd582 precision issue fixed in report 2015-03-23 13:10:50 +05:30
Anand Doshi
885e074697 Changed company name from Web Notes to Frappe Technologies 2015-03-03 14:56:43 +05:30
Anand Doshi
d35354cc06 Merge remote-tracking branch 'frappe/develop' into v5.0 
Conflicts:
	erpnext/__version__.py
	erpnext/accounts/doctype/budget_distribution/test_budget_distribution.py
	erpnext/accounts/doctype/chart_of_accounts/charts/account_properties.py
	erpnext/hooks.py
	erpnext/patches.txt
	erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
	erpnext/stock/get_item_details.py
	erpnext/translations/ar.csv
	erpnext/translations/bs.csv
	erpnext/translations/ca.csv
	erpnext/translations/el.csv
	erpnext/translations/es.csv
	erpnext/translations/fr.csv
	erpnext/translations/hr.csv
	erpnext/translations/id.csv
	erpnext/translations/is.csv
	erpnext/translations/ja.csv
	erpnext/translations/nl.csv
	erpnext/translations/pl.csv
	erpnext/translations/pt-BR.csv
	erpnext/translations/ru.csv
	erpnext/translations/tr.csv
	erpnext/translations/zh-cn.csv
	erpnext/translations/zh-tw.csv
	setup.py
 2015-02-24 18:12:17 +05:30
Anand Doshi
d57e793bf3 [fix] Added unicode_literals if missing in py files 2015-02-24 12:24:53 +05:30
Sambhaji Kolate
973f78e7d3 fixed stock_balance report for stock_uom and stock ledger entry for Delivery Note #2802 2015-02-20 13:09:39 +05:30
Rushabh Mehta
614e7ab757 [cleanup] SMS, and added item filter in stock balance 2015-02-18 19:51:48 +05:30
Nabin Hait
89c52eacc7 Actual operation cost in stock entry, fixed cost removed from bom and workstation 2014-12-23 17:39:00 +05:30
Nabin Hait
ae1dcabcb5 Fixed merge conflict 2014-11-05 12:41:02 +05:30
Nabin Hait
23d7919865 Stock ageing report fix 2014-10-22 13:06:26 +05:30
Rushabh Mehta
be1a8d82c5 [merge] develop 2014-10-21 13:14:55 +05:30
Nabin Hait
8a28ccfa2f Repost gl entries where mismatch with stock balance 2014-10-14 11:41:56 +05:30
Nabin Hait
daf344e5fd Precision fixed in batch-wise balance report 2014-10-13 10:48:26 +05:30
Nabin Hait
7820b171d3 Stock balance grid report deprecated and moved to server side 2014-10-10 18:03:07 +05:30
Nabin Hait
bb19b91ef9 stock reco fixes 2014-10-08 11:02:18 +05:30
Nabin Hait
bfa7f171bd Stock reconciliation sl entries 2014-10-08 11:02:18 +05:30
Nabin Hait
894a1b539a Dynamic link in general ledger and stock ledger report 2014-10-06 13:14:22 +05:30
Nabin Hait
c68646c694 [merge] 4.x to 5.0 2014-10-06 12:57:48 +05:30
ankitjavalkarwork
e9877a0c48 [fix][minor]Add Actual Qty, Projected Qty to Ordered Items to be Delivered Report 2014-10-01 18:07:25 +05:30
Nabin Hait
d60235e239 minor fix in warehouse-wise stock balance report 2014-09-29 11:36:06 +05:30
Anand Doshi
11b75759d2 Merge pull request #2194 from ankitjavalkarwork/stockbalreport 
Update report with Valuation rate, stock values, move to Main report
 2014-09-16 15:22:25 +05:30
81552433qqcom
951da0ca3d added translations to report py file. 2014-09-12 16:07:12 +05:30
81552433qqcom
351be9ca42 translations. 2014-09-12 16:07:11 +05:30
Neil Trini Lasrado
e9882e12ba Cost of Production cycle 2014-09-12 11:25:03 +05:30
ankitjavalkarwork
2e07305616 Update report with Valuation rate, stock values, move to Main report 2014-09-11 16:47:19 +05:30
nabinhait
957971eb1d Column added 'Reqd by Date' in po_items_to_be_billed report 2014-07-28 16:41:33 +05:30
Anand Doshi
b527e54809 Fixed report: Item wise Price List Rate 2014-06-09 18:08:46 +05:30
Nabin Hait
19d1e499c3 Removed Purchase in transit report #1435 2014-06-04 19:00:56 +05:30
Anand Doshi
ec8240e890 Apply User Permissions optional in Script and Query Reports 2014-06-04 17:48:58 +05:30
Nabin Hait
e71159d6ea Standard Rate field removed from item. Fixes #1688 2014-05-30 11:22:14 +05:30
Nabin Hait
732a7e81a0 Incoming rate in stock ledger and valuation rate in stock balance report. Fixes #1706 2014-05-30 11:22:14 +05:30
Nabin Hait
b5a8cab8df Valuation Rate column in Stock Ledger report. Fixed #1633 2014-05-15 11:50:46 +05:30
Nabin Hait
aade34b0c9 Reports and print formats modified for renamed fields 2014-05-13 16:12:37 +05:30
Nabin Hait
827480fd2b import, export and report permission in account and pricing rule 2014-05-12 17:45:37 +05:30
Rushabh Mehta
2c45899a02 fixed strings for translation 2014-04-15 14:41:56 +05:30
Pratik Vyas
b52618c142 frappe._ to __ 2014-04-14 16:25:30 +05:30
Rushabh Mehta
0a0f2495a2 frappe/frappe#478, frappe tests pass, .txt renamed to .json 2014-03-31 17:27:06 +05:30
Anand Doshi
40534f076b Changed creation, modified format frappe/frappe#478 2014-03-28 12:46:53 +05:30
Rushabh Mehta
daae743608 frappe/frappe#478 2014-03-27 17:54:18 +05:30
Anand Doshi
09a9f4c0c9 Added module to Report doctype 2014-03-07 17:20:22 +05:30
Nabin Hait
bc34f3edae shortage qty column added in stock projected qty report 2014-02-28 13:02:00 +05:30