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

3808 Commits

Author SHA1 Message Date
Pranav Nachnekar
6c14a08631
fix: disallow quick entry for doctypes with tree view (#20452) 2020-02-03 17:05:26 +05:30
Suraj Shetty
2f67647f7b Merge branch 'develop' of https://github.com/frappe/erpnext into fix-incorrect-translations 2020-01-29 15:06:50 +05:30
Suraj Shetty
48e9bc3fc9 fix: Incorrect translation syntax 2020-01-29 15:06:18 +05:30
Deepesh Garg
565a810bf7
Merge pull request #20454 from marination/stock-ledger-qty-column 
fix: 'In Qty' and 'Out Qty' columns in Report Stock Ledger
 2020-01-29 09:49:55 +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
Deepesh Garg
0c31d62edd
Merge pull request #20447 from Alchez/dev-driver-address-fetch 
fix: only fetch driver address if not set (develop)
 2020-01-28 09:20:26 +05:30
rohitwaghchaure
7fda3a12cc
Merge pull request #20445 from rohitwaghchaure/copy_to_warehouse_to_target_warehouse_in_delivery_note_item 
fix: to warehouse not set in the customer warehouse
 2020-01-27 19:29:19 +05:30
Rohan Bansal
ce17a546b9 fix: only fetch driver address if not set 2020-01-27 18:08:11 +05:30
Rohit Waghchaure
2dff28498f fix: to warehouse not set in the customer warehouse 2020-01-27 17:56:25 +05:30
Deepesh Garg
1e77a1374d
Merge pull request #20393 from rohitwaghchaure/unlink_reference_name_from_batch_on_cancel_of_stock_transactions_develop 
fix: unlink references from batch on cancellation of stock transactions
 2020-01-23 22:40:26 +05:30
Rohit Waghchaure
8996b7d8a4 delete the auto created batch 2020-01-23 17:44:19 +05:30
Rohit Waghchaure
4f4dbf1996 fix: unlink references from batch on cacnellation of stock transactions 2020-01-23 12:45:45 +05:30
Rohit Waghchaure
0cc4cf2cf5 fix: Zero division error while making finished good entry against the work order 2020-01-21 19:28:08 +05:30
byugandhara
239f0d529e Fix: Spelling correction in throw message of stock entry(#20337) (#20353) 2020-01-21 15:47:27 +05:30
rohitwaghchaure
6ae61a1693 fix: incorrect number of gl entries issue (#20352) 2020-01-20 17:53:19 +05:30
Marica
7653a8b9fa fix: 'get_additonal_costs' is not defined (#20344) 
* fix: 'get_additonal_costs' is not defined

* fix: Re-added get_items on Work order change.
 2020-01-20 15:46:36 +05:30
Nabin Hait
03b116dd01
fix: deprecated fetching item price based on min_qty (#20347) 2020-01-20 15:45:04 +05:30
Nabin Hait
e321fbb0d5
fix: Multiple fixes based on testing on pre-release branch (#20301) 
* fix: Multiple fixes based on testing on pre-release branch

* fix: reload hr settings
 2020-01-16 13:37:25 +05:30
Vishal Dhayagude
654d785776 fix: Delivery note not able to create sales return (#20264) 2020-01-15 19:28:58 +05:30
Marica
9f6c95549a fix: Applied query on PO Supplier popup field in Material Request. (#20231) 2020-01-15 19:24:28 +05:30
Rohit Waghchaure
9650c25429 fix: filter issue for the stock and account value comparision report 2020-01-14 12:12:54 +05:30
deepeshgarg007
00746306a3 fix: Item tax template fetching from HSN Code 2020-01-10 15:01:50 +05:30
gavin
12568e4f07
Merge pull request #19514 from gavindsouza/rename-doc-fix 
fix: frappe.rename_doc update
 2020-01-09 15:07:05 +05:30
rohitwaghchaure
d4d7d211ea feat: report to show difference between stock and account value (#20186) 2020-01-09 15:05:05 +05:30
Suraj Shetty
000ac0068b
Merge branch 'develop' into rename-doc-fix 2020-01-09 13:46:08 +05:30
Don-Leopardo
ccdf19314d fix: min_qty and valid_from for the price selection (#20217) 2020-01-09 12:24:43 +05:30
Marica
c72de6edaa fix: Added description and title to supplier selection popup in Material Request. (#20179) 2020-01-07 13:06:08 +05:30
Deepesh Garg
ef0d26c161 feat: Validity for Item taxes (#20135) 
* feat: Validity for Item taxes

* fix: Trigger for gst hsn code

* fix: Sort taxes based on validity

* fix: Validation for item tax template and filters based on validity

* fix: Add missing semicolon

* fix: Validate tax template only if item code available

* fix: Do not validate or filter item tax template if no item taxes applied

* fix: Consider item group for validating taxes

* fix: Test cases for item tax  validation

* fix: Item tax template filtering fixes

* fix: Add missing semicolon

* fix: Remove unnecessary query
 2020-01-06 15:34:15 +05:30
rohitwaghchaure
055012a7fb
Merge pull request #20170 from nabinhait/inter-company-serial-no-outgoing-rate 
fix: Get outgoing rate of serial no from SLE if serial no already transferred to another company
 2020-01-06 12:07:53 +05:30
rohitwaghchaure
fe2afc643e fix: incorrect valuation rate for finished good entry (#20165) 2020-01-06 11:51:43 +05:30
Marica
159799c238
Merge branch 'develop' into item-min-qty 2020-01-03 12:13:00 +05:30
thefalconx33
7a01367ef1 ux: add description for minimum purchase qty 2020-01-02 19:14:55 +05:30
Nabin Hait
328c4f9b92 fix: Get outgoing rate of serial no from SLE if serial no already transferred to another company 2020-01-02 19:00:47 +05:30
Rohan
938ba3efc4 feat: show item name in Item Price list view (#20156) 2019-12-31 17:21:07 +05:30
Marica
5483f1a27e fix: Field 'other_charges_calculation' column type changed. (#20141) 2019-12-30 22:20:02 +05:30
rohitwaghchaure
9af557f9d7 fix: incorrect batch fetched for the serialized items (#20119) 
* fix: incorrect batch fetched for the serialized items

* Update stock_controller.py

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2019-12-30 13:26:47 +05:30
Ishan Loya
fe0adc8b25 fix: read WIP warehouse from work order (#20131) 
* fix: read wip_warehouse from work order in stock entry even if skip transfer is checked

* fix: remove skip_transfer in stock entry

Related to #10753
 2019-12-30 12:19:08 +05:30
Marica
f4fbdf98d1 fix: Removed unneccesary Duplicate Entry Error. (#20120) 2019-12-27 16:53:05 +05:30
Marica
47ab9850e6 fix: Show both warehouse columns in Stock Entry Grid view. (#20113) 2019-12-27 15:31:07 +05:30
rohitwaghchaure
616431d7c3 fix: incorrect reorder level in stock balance report (#20111) 2019-12-27 12:35:58 +05:30
rohitwaghchaure
a99f926a4b fix: incorrect validation for scrap items (#20109) 2019-12-27 12:21:15 +05:30
Robin Rosenstock
e6387f9dca fix to issue #20089 2019-12-26 08:09:47 +00:00
Himanshu
e2ea11c437 fix: remove quote (#20076) 2019-12-25 15:15:35 +05:30
Parth J. Kharwar
8c4cf12c93 Setting preferred driver email in delivery trip (#19832) 
* fix: add driver's preferred contact email in delivery trip

* fix: modify driver's preferred email patch and blank field checks

* fix: patch file fix

* fix: patch changes to improve speed

* fix: removal of conflicts

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2019-12-25 15:14:52 +05:30
rohitwaghchaure
6e8a9286c2 fix: multiple stock entry issues for the work order (#18686) 
* fix: multiple stock entry issues for the work order

* Update work_order.py

* Update work_order.py

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2019-12-24 18:53:32 +05:30
rohitwaghchaure
5c0ea2d7c9
Merge pull request #19708 from Alchez/dev-batch-to-stock-ledger 
feat: drill down on batch transactions (develop)
 2019-12-24 15:25:05 +05:30
rohitwaghchaure
08433c2919 fix: supplier email id field not showing in the notification for purchase cycle doctypes (#20071) 2019-12-24 13:03:47 +05:30
Deepesh Garg
55bc26e300 fix: Allow creation of multiple landed cost voucher against a Purchase Document (#20058) 2019-12-24 12:55:01 +05:30
Himanshu
5af4c57ef7 fix: ambihious error (#20068) 2019-12-24 12:31:38 +05:30
Rucha Mahabal
0e83a5754b fix: remove illustrations from onboarding slides (#19872) 
* fix: remove illustrations from onboarding slides

* fix: change Welcome slide's description

* fix: justify text in slide
 2019-12-23 08:24:46 +05:30
Gavin D'souza
1e4ea466d3 style: update/standardize rename_doc usage 2019-12-19 19:07:29 +05:30
marination
457ca0fe6c fix: Company None not found in get_valuation_rate 2019-12-19 13:34:29 +05:30
rohitwaghchaure
b500f2ce4c
Merge pull request #19940 from marination/item_manufacturer_table_dev 
fix: Removed 'manufacturers' table from Item Master
 2019-12-16 14:44:49 +05:30
marination
5ab823beab fix: Removed validation from non existent manufacturers table 2019-12-16 12:19:47 +05:30
marination
81990aee9f fix: Removed 'manufacturers' table from Item Master 2019-12-13 13:18:59 +05:30
Deepesh Garg
57e6bcaf43
Merge pull request #19733 from marination/zero-division-basic-amount 
fix: Division by zero error in Stock Entry
 2019-12-13 09:23:44 +05:30
marination
0e33f792d3 fix: Distribute charges based on quantity if Total Basic Amount is Zero. 2019-12-12 16:34:41 +05:30
Rohit Waghchaure
9b0d7b93dd fix: not able to submit the landed cost voucher 2019-12-12 12:10:25 +05:30
Deepesh Garg
0e10340471
Merge pull request #19899 from rohitwaghchaure/not_able_to_cancel_landed_cost_voucher 
fix: not able to cancel the landed cost voucher
 2019-12-11 18:38:23 +05:30
Rohit Waghchaure
37cf096102 fix: not able to cancel the landed cost voucher 2019-12-11 13:50:29 +05:30
Deepesh Garg
6e2c13f4c8 feat(regional): Auto state wise taxation for GST India (#19469) 
* feat(regional): Auto state wise taxation for GST India

* fix: Update gst category on addition of GSTIN

* fix: Codacy and travis fixes

* fix: Travis

* fix(test): Update GST category only if GSTIN field available

* fix: Test Cases

* fix: Do not skip accounts if place of supply is not present

* fix: Auto GST taxation for SEZ Party types

* fix: Automatic taxation for multi state

* fix: Codacy and travis fixes

* fix: Auto GST template selection in Sales Order

* fix: Move inter state check and source state to tax category

* fix: Remove unique check from tax template

* fix: Remove unique check from tax template

* fix: Address fetching logic in Sales

* fix: fecth tax template on company address change

* fix: fetch company gstin on address change

* fix: company_gstin set value fix

* fix: Mutiple fixes and code refactor

* fix: Add missing semicolon

* fix: Company address fetching in sales invoice

* fix: Remove print statement

* fix: Import functools

* fix: Naming fixes and code cleanup

* fix: Iteritems compatibility for python 3
 2019-12-10 15:55:05 +05:30
marination
214acc9a42 fix: Changed check condition and added test 2019-12-09 21:38:19 +05:30
Saqib
5998034b02 fix: error message displays asset category as None (#19873) 
* fix: error message displays asset category as None

* fix: asset gl_entries doesn't considers asset category's cwip account
 2019-12-09 19:07:05 +05:30
Shivam Mishra
9e0b3b29fa feat: better message for serial number creation (#19863) 2019-12-09 18:21:23 +05:30
Deepesh Garg
da638cd476 fix: NoneType' object has no attribute '__getitem_'_ (#19859) 2019-12-09 11:28:31 +05:30
Rucha Mahabal
690068142b feat: Continue Slide and New Illustrations for Onboarding Wizard (#19813) 
* feat: added illustrations for onboarding

* refactor: change help label for supplier

* refactor (breaking): rename Setup Wizard slide to Onboarding Slide

* chore: code cleanup for the old doctype Setup Wizard Slide

* fix: added a 'Continue' type slide

* fix: change text in continue slide

* fix: change text for continue slide
 2019-12-06 20:58:26 +05:30
Rohan
5161ba787c
Merge branch 'develop' into dev-batch-to-stock-ledger 2019-12-06 14:25:00 +05:30
rohitwaghchaure
cfbf895876
Merge pull request #19498 from marination/stock_entry_bom_fetch 
feat: Provision to fetch items from multiple BOMs in Stock Entry
 2019-12-04 21:44:47 +05:30
ronelvcabrera
370cdc0170 feat(Sales/Purchase Order): optional to reference a Blanket Order (#19612) 2019-12-04 16:07:11 +05:30
marination
be88d0f8a3 fix: Custom button conditionally visible in draft condition as well 2019-12-03 18:34:38 +05:30
Anurag Mishra
10017c14f3 feat: HSN Code wise Item Tax (#19478) 
* feat: HSN Code wise Item Tax

* feat: enqueued task of updating all items
 2019-11-29 17:33:10 +05:30
Saqib
20c31dd579 fix: tax templates from all companies fetching in receipt (#19682) 
* fix: tax templates from all companies fetching in receipt

* Update purchase_receipt.js
 2019-11-29 16:55:10 +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
Anurag Mishra
f3b393f5e0 fix: UOM was not fetching in purchase invoice (#19732) 
* fix: UOM was not fetching in purchase invoice

* fix: Changes requested

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2019-11-28 18:52:16 +05:30
Marica
aff678e376 fix: Changed type of column 'serial_no' in Stock Ledger Entry (#19702) 2019-11-28 18:20:48 +05:30
Marica
f51ccbf5d4 chore: Added Quick Stock Balance to Stock Module (#19726) 
- Also 'Stock Balance Report' button no longer primary button
 2019-11-28 16:44:46 +05:30
marination
236140d94c fix: Division by zero error in Stock Entry 2019-11-28 16:36:24 +05:30
Shivam Mishra
30245a0673
Merge pull request #19677 from ruchamahabal/setup_wizard 
feat: Slides for Onboading Wizard in ERPNext
 2019-11-28 14:35:10 +05:30
Rohan Bansal
c7cfc726d7 feat: navigate to stock ledger from batch report 2019-11-27 18:23:31 +05:30
Marica
f0e87f7fdd fix: get_batch_qty_and_serial_no() requires argument 'stock_qty' (#19693) 2019-11-27 15:49:41 +05:30
Rucha Mahabal
58928e8eae
Merge branch 'develop' into setup_wizard 2019-11-27 11:55:53 +05:30
Rucha Mahabal
e2bb82872c fix: moved slide json files to respective modules 2019-11-26 18:46:17 +05:30
Rucha Mahabal
3f8c460584 feat: moved slide action functions from onboarding utils to doctypes 2019-11-26 15:22:45 +05:30
rohitwaghchaure
b5991e9264
Merge pull request #19683 from rohitwaghchaure/bom_ux_fixes_version_12 
fix: BOM UX
 2019-11-26 13:15:40 +05:30
Rohit Waghchaure
9326fb78f2 fix: BOM UX 2019-11-25 18:56:18 +05:30
marination
737d8a1e26 fix: Added comments 2019-11-25 09:42:08 +05:30
Saqib
1919af2ff1 Fixed Asset Refactor Review fixes (#19666) 
* fix: fixed asset item creation ux fixes

* fix: auto creation of asset ux fixes

* fix: [LCV] incorrect condition when checking assets linked with PR

* fix: bulk update assets

* refac: remove company level cwip enabling
* cwip can be enabled only on category level

* fix: #19649
 2019-11-22 16:32:34 +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
Saqib
290253fdd0 fix: last purchase rate greater than selling price (#19617) 2019-11-22 12:12:29 +05:30
Nabin Hait
046137caa2
fix: Multiple fixes related to landed cost accounting (#19657) 2019-11-22 11:34:50 +05:30
marination
e537cda062 fix: Added conditional check for conversion factor 2019-11-20 12:38:58 +05:30
rohitwaghchaure
a85ddf2fb4 fix: performance issue of sales invoice while save/submit (#19598) 
* fix: performace issue of sales invoice while save/submit

* Cached price list data, item group child data, added indexing for blanket order
 2019-11-19 18:47:48 +05:30
Deepesh Garg
87c6718d90 fix: Book valuation expense in specified account rather than expense included in valuation account (#19590) 
* fix: Book valuation expense in specified accout rather than expense included in valuation account

* fix: Remove undefined variable

* fix: Test cases

* fix: Test Case
 2019-11-18 12:34:30 +05:30
Saqib
d995609ffa Fixed asset refactor (#19369) 
* refactor: Asset Movement with multiple assets using table

* refactor: Create Asset Movement from Asset List & Linking PR/PI with Asset

* feat: Auto create asset on Purchase checkbox

* refactor: LCV for asset created via PR/PI

* refactor: get asset category accounts from item master

* refactor: Purchase Receipt for asset purchasing

* refactor: Purchase Invoice for asset purchasing

* fix: post-refactor delete fixes

* refactor: moved asset validation from pr/pi on asset submission

* fix: Asset Category should be defined for auto purchasing assets

* fix: undo serial_no_update removal (for non asset item) from LCV

* fix: remove duplicate calls from item.js

* fix: args position of all occurrence of get_asset_category_account()

* fix: test cases

* fix: landed cost voucher validations

* refactor: test case for auto creation of asset

* fix: removed invalid assertions

* fix: patch errors on travis

* fix: codacy fixes

* fix: PI Items not fetching details from item

* fix: asset movement from list view having default purpose 'Receipt'

* chore: msgprint for selecting item code first while creating asset manually

* fix: alert messages

* minor: asset movement fixes

* fix: lcv was made against submitted assets

* minor: ux fixes

* refac: move specific asset validation to SINV

* chore: remove make_purchase_invoice from asset form
* make asset movement on asset submission
* add PR & PI queries based on item code

* refac: not allow last movement cancellation
* move asset movement creation on asset submission
* asset movement naming series
* add tests

* fix: code review changes

* chore: remove unecessary asset movement updation

* refac: setting latest location while making asset movements
* Added extra validations

* fix: form dashboard make lcv button

* fix: auto asset movement creation validation

* fix: allow lcv against other items after removing submitted assets

* chore: remove unwanted condition

* fix: mismatch debit credit on  purchase of asset with valuation tax

* chore: toggle required field based on movement type

* chore: fix lcv error message

* fix: travis failing

* fix: travis failing test

* fix: wrong conditions after merge

* fix: cannot cancel assets

* fix: travis failing* fix change in deletion of assets

* fix: codacy

* fix: process cancellation of assets

* refac: cancellation of pr only deletes auto created assets

* fix: incorrect query
 2019-11-18 11:46:55 +05:30
marination
a076bddd83 fix: Show 'Bill of Materials' custom button conditionally 2019-11-15 12:03:06 +05:30
rohitwaghchaure
c74c5d5644
Merge pull request #19583 from rohitwaghchaure/fixed_stock_rec_showing_incorrect_current_qty_and_serial_no 
fix: stock reconciliation showing incorrect current serial no and qty
 2019-11-15 10:17:11 +05:30
Rohit Waghchaure
cf55c9c6da fix: stock reconciliation shwoing incorrect current serial no and qty 2019-11-14 18:22:20 +05:30
rohitwaghchaure
ba8fc21594 fix: merge similar entries for serialized items in stock reconciliation (#19408) 2019-11-13 18:11:58 +05:30
Mangesh-Khairnar
06c8129574 fix(batch): fetch company on splitting the batch (#19558) 2019-11-13 10:51:43 +05:30
Marica
d00c59830e feat: Disable CWIP Accounting checkbox added in Company and Asset Category (#19262) 
* feat: Disable CWIP Accounting checkbox added in Company and Asset Category

Asset Settings is removed completely
Disable CWIP Accounting checkbox will give priority to Asset Category

* fix: Changed checkbox name to 'Enable Capital Work in Progress Accounting'

- checkbox will be disabled by default
- Enabling it in Company will globally enable it
- When globally disabled , it's value on the asset category will be considered

* chore: Added patch to set pre-existing CWIP checkbox value into new checkbox

* fix(test): Asset

* fix: Asset Test and Patch

* fix(test): Opening Invoice Creation Tool

* Update asset.py

* fix: Patch and other fixes
 2019-11-12 19:17:43 +05:30
rohitwaghchaure
001ee5ee1b fix: dictionary changed size during iteration (#19546) 2019-11-11 17:43:48 +05:30
rohitwaghchaure
b81942404d fix: incorrect balance qty in stock ledger if batch filter set (#19479) 2019-11-08 14:50:48 +05:30
rohitwaghchaure
d36c6068b2 fix: 'NoneType' object has no attribute 'stock_uom' (#19532) 2019-11-08 14:43:53 +05:30
Deepesh Garg
7a23057eab feat: Enhancement in landed cost voucher (#19252) 
* feat: Enhancement in landed cost voucher

* fix: Make GL entries based on ledgers in Landed cost voucher

* fix: Patch to update expense account in Landed Cost Voucher and Stock Entry

* fix: Ability to select expense account in Stock Entry

* fix: Renaming and test case fixes

* fix: Test Cases

* fix: Additional cost in Stock Entry

* fix: Changed filters and test case fixes

* fix: Upadte filters in stokc entry expense account filter

* fix: company filter
 2019-11-08 12:52:54 +05:30
marination
075f6ea0d5 feat: Provision to fetch items from BOM in Stock Entry 
Items are populated in child table and amounts are calculated
Warehouse Fields in popup toggle based on Stock Entry Type
 2019-11-04 21:58:13 +05:30
Deepesh Garg
ebf46120ba
Merge pull request #18985 from Alchez/dev-serial-no-statuses 
feat: add statuses for Serial No
 2019-11-01 14:16:45 +05:30
deepeshgarg007
c82aed0718 fix: Add missing semicolon 2019-11-01 12:36:33 +05:30
Anurag Mishra
a11e738801 feat: Stock value and account balance sync. (#19233) 
* feat: Allow user to sync stock_value and account_balance jv if perpetual inventory is checked

* fix(test): Sales Invoice

* fix(test): Purchase Invoice

* fix(test): Delivery Note

* fix: more test_case

* fix(test): Stock Entry

* fix(test): Purchase Receipt

* fix(more-test): Stock Entries

* fix(more-test): Sales Invoice and Delivery Note

* fix: tests for delivery note

* fix: tests for stock reconciliation

* refactor: stock and account balance function

* fix(more-test): Warehouse

* fix(test): Landed Cost Voucher

* fix: changes requested
 2019-10-31 15:55:03 +05:30
rohitwaghchaure
139c20a736
Merge pull request #19454 from rohitwaghchaure/fix_item_price_stock_report_not_working_v12 
fix: item price stock report not working
 2019-10-30 22:30:10 +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
Deepesh Garg
118f2c7d64
Merge pull request #19402 from Mangesh-Khairnar/fix-dn-status 
fix: sync delivery note status in both list view and form view
 2019-10-29 14:17:38 +05:30
Rohan
fba7cae2c9
Merge branch 'develop' into dev-serial-no-statuses 2019-10-29 11:25:36 +05:30
Deepesh Garg
9942fcc8cb fix: Better validation msg for difference account in Stock Entry (#19400) 
* fix: Better validation msg for difference account

* fix: Make primary info bold
 2019-10-28 12:08:31 +05:30
Mangesh-Khairnar
233c0bc779 fix: sync delivery note status in both list view and form view 2019-10-24 15:46:12 +05:30
Rohan
8522fdc99c
Merge branch 'develop' into dev-serial-no-statuses 2019-10-22 17:11:30 +05:30
Nabin Hait
bebbc6371b fix: Validation message in work order 2019-10-22 12:35:28 +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
Rohan
a77f534f7c
Merge branch 'develop' into dev-serial-no-statuses 2019-10-16 15:08:57 +05:30
rohitwaghchaure
0bb99c15e5 fix: while submitting landed cost voucher user getting negative stock error (#19269) 2019-10-14 15:18:36 +05:30
Anurag Mishra
8e937e9640 fix: packed items child table reset on amending docs (#19157) 2019-10-11 11:50:38 +05:30
Saqib
66762380ed fixes: internal issues (#19201) 
* fix: Delivery Trip now has editable start address.

* fix: default party type not set in Journal Entry

* fix: maintainence visit purpose table not fetching item name

* fix: maintainence visit purpose table not fetching item name
 2019-10-11 11:09:10 +05:30
Rohan
6c8fe5ae02
Merge branch 'develop' into dev-serial-no-statuses 2019-10-10 17:47:30 +05:30
Marica
ccad0a4cf9 feat: Stock Quick Balance (#19123) 
* feat: Stock Quick Balance

It will display the stock balance and stock value given the date and warehouse
Item code can be fed or barcode can be scanned to retrieve the values

* fix: Codacy fixes

* fix: Renamed to Quick Stock Balance and minor fixes

Refactored code , combined functions to make it DRY
Added permissions for Stock User and Manager
Added more context to naming
 2019-10-09 15:24:58 +05:30
rohitwaghchaure
16b8e7c432
Merge pull request #19248 from rohitwaghchaure/not_able_to_submit_work_order_v12 
fix: not able to submit the work order
 2019-10-05 23:29:44 +05:30
Rohit Waghchaure
484e1fb218 fix: not able to submit the work order 2019-10-04 17:58:21 +05:30
Saqib
d5067b4d73 chore: label changes in retail and stock (#19243) 2019-10-04 16:24:26 +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
DeeMysterio
20194c4cc5 rename return/invoice to Purchase return/invoice (#19212) 2019-09-30 16:59:15 +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
Rohan
c86cdd609e
Merge branch 'develop' into dev-serial-no-statuses 2019-09-30 13:08:10 +05:30
Deepesh Garg
7b1b3f0fa8 fix: Allow alternative item in stock entry while transfering material to subcontractor (#19189) 2019-09-30 11:01:05 +05:30
Rucha Mahabal
3564ac7c88 fix: don't create debit/credit note automatically (#19185) 2019-09-30 10:59:28 +05:30
DeeMysterio
5ef26b42a8 feat(delivery note): make the delivery trip plus button fetch data from delivery note (#19046) 2019-09-30 10:57:32 +05:30
Rohan
e19e16fbf1 fix: remove internal fields from print (#19101) 2019-09-30 10:54:01 +05:30
Mangesh-Khairnar
77f22635f2 fix(stock-ageing): filter none values from the fifo queue 2019-09-27 17:50:52 +05:30
Nabin Hait
001edb4464
refactor: Reposting utility of Stock ledger (#19155) 2019-09-26 16:44:35 +05:30
thefalconx33
c15cc8fc28 fix: #18624 2019-09-24 18:49:16 +05:30
Nabin Hait
786d7bd3d4
Merge branch 'develop' into dev-serial-no-statuses 2019-09-24 11:50:33 +05:30
Deepesh Garg
2e7419d78f fix: Do not validate warehouse in case of Repack (#19050) 2019-09-24 10:05:42 +05:30
Himanshu
fdad33309b fix: get correct warehouse for product bundle (#19130) 2019-09-24 10:03:34 +05:30
Mangesh-Khairnar
5dcf2c669f chore: remove unlinked letter head references (#19138) 2019-09-24 09:53:06 +05:30
rohitwaghchaure
8dd4699f10 feat: Allow to make landed cost voucher against the asset item (#19121) 2019-09-23 15:03:52 +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
rohitwaghchaure
6bbc834f8f
Merge pull request #19112 from rohitwaghchaure/fixed_get_bin_details_and_serial_nos_arugument_passing_issue 
fix: get_bin_details_and_serial_nos() takes at least 3 arguments (4 g…
 2019-09-19 18:01:03 +05:30
Rohit Waghchaure
6daab3ca89 fix: get_bin_details_and_serial_nos() takes at least 3 arguments (4 given) 2019-09-19 17:01:49 +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
Rohan
b9c1dad2e6
Merge branch 'develop' into dev-serial-no-statuses 2019-09-18 13:24:28 +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
Marica
bac4b93639 fix: Displaying manufacturer part no along with manufacturer and added Manufacturers validation in Item master (#19066) 
Manufacturer Link field options in Items Table of transactions will also display manufacturer part no.
Manufacturers table in Item master will check for duplicate entries.
 2019-09-16 19:44:28 +05:30
Deepesh Garg
8cc2f83bd5 fix: Fetch scrap items from BOM if purpose is repack (#19056) 2019-09-16 14:49:12 +05:30
Shivam Mishra
a3095c987a fix: optimized query (#19026) 
Co-authored-by: nabinhait
Co-authored-by: sahil28297 <sahilkhan28297@gmail.com>
 2019-09-12 17:28:37 +05:30
Rohan Bansal
bf7e012bde feat: add statuses for Serial No 2019-09-10 15:55:54 +05:30
Mangesh-Khairnar
1853a83453 fix(packing-slip): add a descriptive message (#18981) 2019-09-10 13:21:01 +05:30
rohitwaghchaure
d312d11062 fix: port from hotfix (#18974) 
* fix: '>' not supported between instances of 'int' and 'str'

* fix: not able to save item because price list has disabled
 2019-09-10 10:47:36 +05:30
Mangesh-Khairnar
cbcede79b1
Merge pull request #18964 from nabinhait/max_carry_forwarded_leaves 
feat: Added input field for max carry forwarded leaves
 2019-09-09 14:38:06 +05:30
Faris Ansari
32eccb8fb2 fix: Rename duplicate label Image to Website Image (#18912) 2019-09-09 14:29:01 +05:30
Nabin Hait
fb7c7b53ba feat: Added input field for max carry forwarded leaves 2019-09-09 12:08:58 +05:30
MorezMartin
ffc4f8f2a5 feat: [stock -> packed_items] Enable modification of Description on packed items (#18907) 
* Change packed item

* Remove description field on update_packed_items

* add possibility to modify description on packed items
 2019-09-09 10:16:23 +05:30
Nabin Hait
4ce38059ac feat: Company wise credit limit 2019-09-06 14:33:10 +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
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
John Clarke
a7d448dcba fix: Error "TypeError: unorderable types: int() > str()" When Trying to Create Packing Slip (#18913) 
User report here https://discuss.erpnext.com/t/error-typeerror-unorderable-types-int-str-when-trying-to-create-packing-slip/52445

This has not been noted to github issues and is just a suggested fix, an expert may need to refactor more here?

User and traceback does not state whether Python 2 or 3 but perhaps 3 since that apparently does not 'guess' when types do not match?

See also https://stackoverflow.com/questions/14886881/unorderable-types-int-str
 2019-09-05 14:55:35 +05:30
Rohan
9d77e9f719 fix: error while trying to get directions (#18827) 2019-09-05 14:51:22 +05:30
rohitwaghchaure
f1fab871b8 fix: mismatch between warehouse tree value and warehouse based stock balance report value (#18879) 2019-09-05 14:47:43 +05:30
Nabin Hait
b03fa8a441
Merge branch 'develop' into feat-customer-credit-limit 2019-09-05 12:34:34 +05:30
rohitwaghchaure
805b8634da fix: incorrect stock value difference when stock move from negative to positive (#18887) 2019-09-05 12:18:33 +05:30
Mangesh-Khairnar
4bcc221ee3 Merge branch 'develop' of https://github.com/frappe/erpnext into feat-customer-credit-limit 2019-09-02 23:18:56 +05:30
deepeshgarg007
8666ecc26f fix: Purchase receipt test 2019-09-02 17:41:12 +05:30
deepeshgarg007
402d82b4c5 fix: Remove delete_doc from tests 2019-09-02 14:37:18 +05:30
Suraj Shetty
72bea0dff4 test: Add test to check creation of pick list from multiple sales order 2019-08-31 18:34:25 +05:30
Suraj Shetty
736b5e07cc fix: Maintain the order of Item List 2019-08-31 18:33:23 +05:30
Suraj Shetty
ca58fde552 test: Enable basic tests 2019-08-31 16:58:51 +05:30
Suraj Shetty
bcfec77e2c style: Use single quotes 2019-08-30 19:44:37 +05:30
Suraj Shetty
744b92d233 fix: Commonify item not available alert 
- Reorganise code
- UX fixes
 2019-08-30 19:39:28 +05:30
Suraj Shetty
0eed0a9abe test: Temporarily comment out tests 2019-08-30 19:12:16 +05:30
Suraj Shetty
0df38891a1 fix: Update pick list print format 2019-08-30 15:59:35 +05:30
Suraj Shetty
5e84ce55ae fix: Add is_stock_item filter for item in locations table 2019-08-30 10:01:49 +05:30
Suraj Shetty
effe53d4ae fix: Set default value for qty 2019-08-30 09:52:08 +05:30
Suraj Shetty
9641edc562 fix: Set item locations before save 2019-08-29 22:23:13 +05:30
Suraj Shetty
9b42682575 fix: Check parent warehouse for batch as well 2019-08-29 21:14:26 +05:30
Suraj Shetty
a6ab00162e style: Remove commented code 2019-08-29 20:17:04 +05:30
Mangesh-Khairnar
79525327f0 feat: bypass credit limit check 2019-08-29 19:50:23 +05:30
Suraj Shetty
3e11338ed5 fix: Validate count of serial numbers 2019-08-29 19:46:49 +05:30
Suraj Shetty
acd00df8fb Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list 2019-08-29 17:24:23 +05:30
Suraj Shetty
ed1ec82d2f refactor: Item picking logic 
- Fix serial number selection
- Get limited item location based on required qty
- Store total item count to properly track available locations
- Pass missing serial no.
 2019-08-29 17:23:09 +05:30
Deepesh Garg
dbe8dab3ce
Merge pull request #18794 from deepeshgarg007/supplier_items 
fix: Enhancement in Purchase Order
 2019-08-29 16:29:02 +05:30
Suraj Shetty
1c29c520bd Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list 2019-08-29 13:18:57 +05:30
Suraj Shetty
66f2bc69a6 fix: Item mapping of stock entry with no reference 2019-08-29 09:23:31 +05:30
Suraj Shetty
55a2699f4c fix: Update dashboard of doctypes that are linked with pick list 2019-08-29 09:14:27 +05:30
Suraj Shetty
f455c92d02 fix: Remove Pick List Reference Item use Item locations table instead 2019-08-28 17:44:22 +05:30
Rohit Waghchaure
d03d8204ab fix: incorrect valuation rate calculated because of string replacement issue 2019-08-28 17:22:50 +05:30
Suraj Shetty
1cf7270049 fix: Add picklist dashboard config 2019-08-28 12:40:58 +05:30
Suraj Shetty
be0ae7a430 fix: Doctype changes 
- Check no copy for work order series field
- Add dashboard
- Set naming_series for pick list
 2019-08-28 12:40:26 +05:30