Nabin Hait
8b686a5721
feat: stock module dashboard and onboarding
2020-05-19 19:08:30 +05:30
marination
658f29915a
fix: PR and DN trend report charts, group by fixes
2020-05-19 13:58:13 +05:30
marination
be5c45a9ae
chore: Fixtures and empty state handling in chart widgets
2020-05-15 13:21:58 +05:30
marination
bb95cd5fd8
chore: Added Dynamic Charts to DN and PR Trends Reports
2020-05-15 01:33:43 +05:30
marination
10bd2417ff
feat: Custom Dashboard 'Warehouse wise Stock Value' with Chart Source
2020-05-14 15:35:18 +05:30
marination
021acd0a01
chore: Stock Ageing and Item Shortage Reports with Charts
2020-05-14 13:20:43 +05:30
marination
3568dc75be
fix: Make Company the first filter
2020-05-01 00:01:37 +05:30
marination
89c41d8384
chore: Added company filter and minor cleanup in Stock Balance Report
2020-04-30 13:56:49 +05:30
Deepesh Garg
2a9c5badc6
feat: Immutable ledger ( #18740 )
...
* fix: Reverse GL entry on cancellation of document
* fix: Removed set posting time field for multiple docs
* fix: Stop future reposting and reverse entry for purchase receipt and delivery note
* fix: Change is_cancelled field from select to check
* Revert "fix: Removed set posting time field for multiple docs"
This reverts commit 81fb808db7da69ab1e58ba226c0cd0b77e5b90c8.
* fix: Multiple fixes in GL Entry
* fix: Remove future reporting from doctypes
* fix: Canceled entry filters in Stock Ledger and General Ledger Report
* fix: Remove print statement
* fix: Validation for back dated entries
* fix: Codacy fixes
* fix: Add ignore links to multiple doctypes
* fix: Codacy Fixes
* fix: Ignore GL Entry and Stock Ledger entry while cancel
* fix: Test case fixes
* fix: Patch
* fix: Codacy
* fix: Budget Test Cases
* fix: Patch
* fix: Patch
* fix: Multiple test cases
* fix: changes in make_reverse_entry function
* fix: Update patch
* fix: Test Cases
* fix: Test Case fixes
* fix: Move patch upward in patches.txt
* fix: Budget Test Cases
* fix: Test Case and codacy
* fix: Patch
* fix: Minor label and UX fixes
* fix: Move freezing date check
* fix: Test Cases
* fix: Test cases
* fix: Test Cases
* fix: Test Case
* fix: Remove update_gl_entries_after function
* fix: Remove update_gl_entries_after function
* fix: Test Cases
* fix: Fiscal Year wise backdated entry
* fix: Update entries only for current SLE
* fix: Remove is_cancelled
* fix: Test Cases
* fix: Test cases
* fix: Test Cases
* fix: Uncomment account and stock balance sync logic
* fix: Stock balance and Account balance out of sync fixes
* fix: Test Cases
* fix: Test cases for POS, Stock Reco and Purchase Receipt
* fix: Stock Reco tests
* fix: Test stock reco precision
* fix: Test stock reco for fifo precision
* fix: Test stock reco for fifo precision
* fix: Stock Entry test case
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-30 10:38:58 +05:30
marination
6c871d6bcf
fix: Removed Finished Product and Finished Qty columns from Stock Ledger Report
2020-04-28 21:28:53 +05:30
rohitwaghchaure
28deddeb6f
fix: incorrect out value in stock balance due to precision issue ( #21379 )
2020-04-23 09:44:58 +05:30
Rohit Waghchaure
560f822dbf
fix: get serial nos based on posting date and time
2020-04-07 14:42:02 +05:30
Saqib Ansari
ed3553f795
chore: [ux] filter warehouse based on company
2020-03-28 19:12:59 +05:30
Rohit Waghchaure
cd2478a527
fix: shortage qty in stock projected qty report
2020-03-19 09:27:53 +05:30
Deepesh Garg
b61b8d7ced
fix: Remove comma
2020-01-29 09:49:26 +05:30
marination
372c5e51d5
fix: 'In Qty' and 'Out Qty' columns in Report Stock Ledger
2020-01-28 16:04:49 +05:30
Rohit Waghchaure
9650c25429
fix: filter issue for the stock and account value comparision report
2020-01-14 12:12:54 +05:30
rohitwaghchaure
d4d7d211ea
feat: report to show difference between stock and account value ( #20186 )
2020-01-09 15:05:05 +05:30
rohitwaghchaure
616431d7c3
fix: incorrect reorder level in stock balance report ( #20111 )
2019-12-27 12:35:58 +05:30
Robin Rosenstock
e6387f9dca
fix to issue #20089
2019-12-26 08:09:47 +00:00
Rohan
5161ba787c
Merge branch 'develop' into dev-batch-to-stock-ledger
2019-12-06 14:25:00 +05:30
Suraj Shetty
9d6d95c4a2
fix: valuation of "finished good" item in purchase receipt ( #19268 )
...
* fix: Remove redundant purchase orders and unwanted condition
* fix: [WIP] Purchase receipt value
* fix: Add raw material cost based on transfered raw material
* fix: get_qty_to_be_received
* fix: Remove debugger statement
* fix: Reset rm_supp_cost before setting subcontracted raw_materials
* test: Fix and modify tests for backflush_based_on_stock_entry
* fix: Add non stock items to Purchase Receipt from Purchase Order
* fix: Ignore valuation rate check for non stock raw material
* fix: Rename check all rows
* fix: Remove amount from test
* test: Fix item rate error
* fix: handling of serial nos in backflush
* fix: Add serial no. of raw materials
* fix: [WIP] Handle Batch nos for purchase reciept backflushed raw material
* fix: Raw material batch number selection in purchase receipt
* Update test_purchase_order.py
2019-11-29 13:26:52 +05:30
Rohan Bansal
c7cfc726d7
feat: navigate to stock ledger from batch report
2019-11-27 18:23:31 +05:30
Marica
b5c296da9e
fix: Validation Error message on Prepared Report. ( #19639 )
...
Give the user the reason why he has to use filters.
2019-11-22 14:38:58 +05:30
rohitwaghchaure
b81942404d
fix: incorrect balance qty in stock ledger if batch filter set ( #19479 )
2019-11-08 14:50:48 +05:30
Rohit Waghchaure
d8b64cd199
replaced frappe.db.sql with frappe.get_all
2019-10-30 16:27:58 +05:30
Rohit Waghchaure
2e01573a40
fix: item price stock report not working
2019-10-30 16:22:30 +05:30
Anurag Mishra
eaff541349
fix: query ( #19376 )
2019-10-22 11:46:17 +05:30
Deepesh Garg
c58d7d8a98
Merge pull request #19363 from rohitwaghchaure/stock_balance_report_not_working_for_stock_recon
...
fix: stock balance report not working if actual qty is zero
2019-10-21 15:52:40 +05:30
Rohit Waghchaure
432b03572a
fix: stock balance report not working if actual qty is zero
2019-10-21 13:42:54 +05:30
Nabin Hait
dfc10bb5ae
fix: Fixed consumed qty based on Stock Ledger Entry ( #19305 )
...
* fix: Fixed consumed qty based on Stock Ledger Entry
* Update itemwise_recommended_reorder_level.py
2019-10-21 13:41:42 +05:30
Mangesh-Khairnar
9351313186
Merge branch 'develop' of https://github.com/frappe/erpnext into fix-stock-ageing-report
2019-10-03 19:21:17 +05:30
Mangesh-Khairnar
ea70c6f696
fix: dynamically filter fifo queue
2019-10-03 19:19:42 +05:30
rohitwaghchaure
ed1cc18ab5
fix: stock ledger report not showing data if the UOM filter has selected ( #19179 )
2019-09-30 15:15:52 +05:30
Mangesh-Khairnar
77f22635f2
fix(stock-ageing): filter none values from the fifo queue
2019-09-27 17:50:52 +05:30
Mangesh-Khairnar
5dcf2c669f
chore: remove unlinked letter head references ( #19138 )
2019-09-24 09:53:06 +05:30
Suraj Shetty
462d9cb331
feat: "Purchase Order items to be Received or Billed" report ( #19091 )
...
* feat: Init "Purchase Order items to be received or billed" report
* fix: Rename report
* fix: Column name
2019-09-20 18:30:22 +05:30
Suraj Shetty
28d182af15
fix: Permission issue in Total Stock Summary report ( #19110 )
...
Data in "Total Stock Summary" report were not getting filtered
based on applied user permissions because some link fields had
wrong options
2019-09-19 11:13:22 +05:30
kaviya
9e4f674fb9
fix: indentation error in stock ageing
...
fixes https://travis-ci.com/frappe/erpnext/jobs/235815591#L1720
2019-09-17 16:02:11 +05:30
Suraj Shetty
bc001d2d9a
feat: Add stock ageing data to stock balance report ( #19036 )
...
* feat: Add stock ageing data to stock balance report
* fix: Use fifo queue warehouse wise
* fix: "Stock Ledger Entry" get query
* fix: Remove unwanted quotes in item details query
* fix: Check if no SLE was passed
* fix: Codacy
* fix: Add logic to include additional UOM columns
* fix: Show stock ageing data optionally
2019-09-16 19:57:04 +05:30
deepeshgarg007
06f99cae36
fix: Fixes in stock ageing report
2019-07-26 10:32:08 +05:30
deepeshgarg007
7fdab021b6
fix: Use get_serial_no and remove batch
2019-07-26 10:26:13 +05:30
deepeshgarg007
1495c9599a
fix: Remove batch
2019-07-26 10:25:54 +05:30
deepeshgarg007
e3a2ab184e
fix: Consider serial no and batches in Stock ageing report
2019-07-26 10:25:15 +05:30
deepeshgarg007
f7733be322
fix: Enhancement in stock ageing report
2019-07-26 10:25:04 +05:30
deepeshgarg007
4d53992b35
fix: Changed columns to new dict form
2019-07-26 10:24:40 +05:30
Nabin Hait
ca25b925f5
fix: Calcellation logic for reconciliation of serialized items
2019-07-22 17:00:32 +05:30
rohitwaghchaure
f078031c60
fix: multiple minor issues in delayed order report ( #18134 )
2019-07-03 11:43:38 +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
Shivam Mishra
468d5563c6
fix: set serial numbers as data field
2019-06-27 14:13:54 +05:30
Anurag Mishra
3d47a6dbb5
fix: Company filters in Total Stock Summary Report ( #17965 )
2019-06-17 17:49:04 +05:30
Rohit Waghchaure
725f56faca
feat: delayed order reports
2019-06-17 12:50:44 +05:30
Anurag Mishra
4c1639305f
feat: creating stock entry against purchase receipt
2019-06-14 12:31:08 +05:30
Anurag Mishra
bbe2c4fb01
fix: fetch item on the base of item group
2019-06-12 19:09:51 +05:30
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
deepeshgarg007
4c366eed23
Minor issue fixes
2018-11-15 12:02:07 +05:30
Frappe Bot
b5c7b96a73
Merge branch 'staging' into develop
2018-11-13 11:33:31 +00:00
Deepesh Garg
84483ff776
Stock analytics script report ( #15630 )
...
* Stock analytics script report
* Codacy Issue Fixes
* Codacy Issue Fixes
* Removed Trailing Whitespaces
* Code cleaning and optimization
* Minor Changes
* Code cleaning and spacing
* Added link for stock analytics in stock.py
* Refactoring and code cleaning
* Codacy issue fixes
2018-11-12 17:05:31 +05:30
Ameya Shenoy
f3f997f232
Merge branch 'staging' into develop
2018-10-31 13:51:52 +00:00
Ameya Shenoy
961849beb4
Merge branch 'master' into staging-fixes
2018-10-31 13:43:12 +00:00
rohitwaghchaure
cd11bdfdbb
[Fix] Supplier wise sales analytics report not showing item details which is added in purchase invoice with update stock ( #15869 )
2018-10-31 18:02:00 +05:30
Ameya Shenoy
c1231d65fd
Merge branch 'staging' into develop
2018-10-19 13:27:07 +00:00
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
Ameya Shenoy
d1c467bcf5
Merge branch 'staging' into develop
2018-10-17 09:44:39 +00:00
Shreya Shah
8e71074e1c
fix(report): Add column for Item Name ( #15702 )
2018-10-16 14:36:49 +05:30
Shreya
82660913a5
fix(report): Add column for Item Name
2018-10-16 12:15:56 +05:30
Ameya Shenoy
f90af80344
Merge branch 'staging' into develop
2018-10-11 06:58:53 +00:00
Shreya Shah
8a4bcefec4
fix(accounts-receivable): Column values in Print and PDF ( #15621 )
2018-10-08 18:34:01 +05:30
Ameya Shenoy
da10f6ebd8
Merge branch 'staging' into develop
2018-10-04 11:51:30 +00:00
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
Nabin Hait
1e7c32b909
Payroll fixes and more ( #15475 )
...
* fix(payroll): multiple minor fixes related to salary structure
* Added GSTR-1 and GSTR-2 report in Accounts module page
* delete asset movement records on cancellation of Purchase Receipt
* Update consolidated_financial_statement.py
* minor fix
* minor fix
* add filters on item prices report (#15495 )
2018-09-26 18:01:00 +05:30
RicardoJohann
171c7d4128
add filters on item prices report ( #15495 )
2018-09-26 15:58:06 +05:30
Suraj Shetty
bfc195dd8b
Changes to support refactor in frappe pg-poc branch ( #15287 )
...
* Remove quotes from sql to make it compatible with postgres as well
* Fix queries
- Replace mysql specifc queries with standard ones
* Make repo URL chages to test pg-poc
* Add root passowrd to test site config
* Fix quotes issue
* Remove debug flag from a pricing rule query
* Remove python 3.6 version from travis.yml
* Fix improper query issue
* Fix incorrect query
* Fix a query
- This fix need to be changed when we will start supporting postgres
since date_format is not supported by postgres
* Get price list map as dict
* Convert price_list_currency_map to dict
2018-09-21 10:20:52 +05:30
Nagarajan
8be8345b65
Stock Projected Qty Item Group Filter ( #15340 )
...
* Update stock_projected_qty.js
* Update stock_projected_qty.js
* Update stock_projected_qty.py
* Update stock_projected_qty.js
2018-09-07 16:20:18 +05:30
Nabin Hait
a2a6568b7e
fix(reports): Made gstr1 ready for govt portal
2018-09-06 17:44:31 +05:30
Saurabh
5c3590fa8d
Merge branch 'master' into develop
2018-08-31 11:29:14 +05:30
rohitwaghchaure
624927bf0b
[Fix] Not able to export the Supplier-Wise Sales Analytics report ( #15271 )
2018-08-30 19:19:14 +05:30
Nabin Hait
fa06ee80e9
Fixed merge conflict
2018-07-27 12:54:00 +05:30
Zarrar
a22e0d0c99
return empty if no stock ledger entry found ( #14968 )
2018-07-23 11:31:04 +05:30
Saurabh
d7897f1c53
Resolved merge conflicts
2018-07-18 17:08:16 +05:30
rohitwaghchaure
07d0e9a2b2
Don't show disabled items in the stock balance report ( #14851 )
2018-07-09 16:56:41 +05:30
rohitwaghchaure
1501a6e58e
[Fix] Data missing issue in stock ledger report ( #14755 )
2018-07-01 16:42:00 +05:30
Bassam Ramadan
45725c2c7b
add missing brand filter to stock balance report ( #14597 )
...
add missing brand filter to stock balance report
2018-06-20 17:41:29 +05:30
Saurabh
0eb622f7da
[fix] resolve conflicts
2018-05-31 17:32:17 +05:30
Saurabh
3c1b153cdb
Merge pull request #14111 from netchampfaris/stock-ledger-report-hotfix
...
[fix] Stock Ledger report item filter
2018-05-28 15:23:21 +05:30
Ameya Shenoy
95e60927b4
Merge branch 'master' into develop
2018-05-24 08:45:14 +00:00
Manas Solanki
f7713ebfa7
[optimize] introduce two filter in the report in order to handle large item master data ( #14193 )
2018-05-23 19:43:04 +05:30
Achilles Rasquinha
efb731941d
ran 2to3, evaluation ( #13499 )
...
* ran 2to3, evaluation
* Update update_gstin.py
* Update accounts_receivable_summary.py
2018-05-23 11:31:24 +05:30
Faris Ansari
9e4889d756
[fix] Stock Ledger report item filter
...
- breaks when Item Code contains % symbol
2018-05-17 12:18:28 +05:30
Suraj Shetty
dcc90e3312
Add fix to support changes in user permission ( #13923 )
...
https://github.com/frappe/frappe/pull/5494
2018-05-04 17:52:57 +05:30
rohitwaghchaure
125c0caf12
Added brand in item price doctype, item prices report ( #13900 )
2018-05-03 16:23:57 +05:30
Saurabh
9738d52d5f
Merge branch 'master' into develop
2018-04-24 12:09:40 +05:30
Saurabh
d2065ce3bf
typo fix
2018-04-24 12:07:37 +05:30
Saurabh
2e7a45dbb4
resolved merge conflicts
2018-04-24 11:16:13 +05:30
Saurabh
2476a8aab9
a[fix] check content before making in condition
2018-04-17 20:45:06 +05:30
Saurabh
46743d00d6
Merge branch 'master' into develop
2018-04-17 12:00:21 +05:30
Saurabh
9fbb8192e1
[fix] do not escape % while using clause ( #13677 )
2018-04-17 11:56:46 +05:30
Nabin Hait
642d39098a
Fixed merge conflict
2018-04-13 14:38:57 +05:30
Nabin Hait
c10e106f8f
Optimization related to large number of items ( #13606 )
2018-04-12 13:25:03 +05:30
Sanjay Kumar
6225b769a6
remove external app reference and update get_warehouse_list ( #13597 )
2018-04-11 02:19:36 -08:00
Nabin Hait
e9638be032
fixed merge conflict
2018-04-06 15:18:27 +05:30