Commit Graph

1304 Commits

Author SHA1 Message Date
Saqib
438e0433a3
fix: cannot set warehouse on deleting all so items and updating them (#21078)
* fix: cannot set warehouse on deleting all so items and updating them

* fix: travis

* fix: docname is editable in update items dialog
2020-04-03 10:02:56 +05:30
Saqib
bba78f0384
fix: auto created asset message (#21108)
* fix: auto created asset message

* Update erpnext/controllers/buying_controller.py

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-03-31 10:49:44 +05:30
Deepesh Garg
fbf6e56d86
fix: Expense account currency validation in Landed Cost voucher (#21073)
* fix: Expense account currency validation in Landed Cost voucher

* fix: Remove unused imports
2020-03-31 10:45:32 +05:30
Saqib Ansari
b345fe0fe9 chore: hyperlinks in cannot cancel message 2020-03-28 20:11:26 +05:30
Nabin Hait
ddc3bb2251
fix: Multiple fixes for travis (#20924)
* fix: Multiple fixes for travis

* fix: Multiple fixes for travis

* fix: Run dashboard patch if table already exists

* fix: Multiple fixes for travis

* fix: deletion of auto-created batch
2020-03-17 17:04:18 +05:30
Saqib
ff52d16fb3
chore: control reposting of future gl entries with flags (#20774) 2020-03-02 15:19:18 +05:30
Saqib
e9ac3e0d64
feat: link serial no to batch no (#20778)
* feat: link serial no to batch no

* fix: test cases
2020-03-02 15:02:58 +05:30
Saqib
fb35a54bee
perf: improve gl entry submission (#20676)
* perf: improve gl entry submission

* perf: add indexes

* fix: replace **kwargs with *args

* fix: syntax error

* fix: remove cypress

* fix: travis

* chore: remove purchase invoice from status updater

* fix: set_staus args

Co-Authored-By: Nabin Hait <nabinhait@gmail.com>

* fix: only update status for invoices & fees

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-02-27 18:32:19 +05:30
Saqib
dd374ff77b
fix: only update items if rate or qty changed (#20742) 2020-02-27 12:51:31 +05:30
Marica
62ba320f5b
fix: Lock stock ledger entries that are being reposted. (#20737)
- If stock ledger entries are being reposted, don't let any other transaction apply itself on the same.
2020-02-26 18:51:13 +05:30
Deepesh Garg
0ebace5da2
fix: Update paid amount for pos return (#20543)
* fix: Paid amount updation for pos return

* fix: Remove console

* fix: Styling

* fix: get  default mode of payment from POS profile

* fix: Add test cases

* fix: Codacy
2020-02-25 13:21:16 +05:30
Deepesh Garg
15ff6a594b
feat: Inter warehouse stock transfer on valuation rate with taxation (#20083)
* fix: Validation for target warehouse

* feat: Get items on valuation rate in delivery note on Internal transfers

* fix: Create Inter company purchase receipt from delivery note

* feat: Inter company stock transfer on valuation rate with taxation

* fix: Add from warehouse in purchase invoice

* fix: Use get_value instead of get_cached_value

* fix: Get incoming rate instead of valuation rate

* fix: GL entry for from warehouse in purchase receipt

* fix: GL Entries fixes in purchase invoice

* fix: Address and tax fetching fixes

* fix: Add test case for stock transfer via purchase receipt

* fix: Code cleanup, added validations and test cases

* fix: Validation for supplier warehouse

* fix: Test Cases

* fix: Change validation condition

* fix: Address fixes while creating Purchase Receipt from delivery note

* fix: Set taxes while creating Purchase Receipt from Delivery Note

* fix: Update set_missing_value function

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-02-18 12:28:41 +05:30
Deepesh Garg
930e61d6e3 Merge pull request #20549 from nextchamp-saqib/so-update-items-warehouse-fix
fix: mandatory warehouse wrror while updating items after submission
2020-02-10 12:09:11 +05:30
thefalconx33
9225159d8c fix: mandatory warehouse wrror while updating items after submission 2020-02-09 12:19:03 +05:30
Suraj Shetty
da2c69e836 fix(translations): Incorrect syntax 2020-01-29 15:34:06 +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
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
Marica
4e6b3ada0f fix: Missing argument in status updater (#20281) 2020-01-15 19:22:35 +05:30
rohitwaghchaure
61ad6292d6 fix: incorrect number of GL Entries error in stock entry (#20299) 2020-01-15 16:35:31 +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
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
thefalconx33
2073eeb8fa fix: don't allow deletion of items which has work order assigned to it 2019-12-27 16:26:03 +05:30
Nabin Hait
f32fc230f7 fix: rounding adjustment while both inclusive tax and discount amount present 2019-12-25 14:01:38 +05:30
Saqib
0ad7449ae3 feat: allow adding & deleting of items in submitted SO & PO (#19911)
* feat: allow adding of items after quotation submission

* feat: allow deletion of items from submitted SO & PO

* fix: case when items are added and deleted at once

* fix: add test cases
* For deletion of items while Updating Items after submitting PO & SO
2019-12-24 16:42:30 +05:30
Don-Leopardo
5557b16260 fix: order_type validation restriction (#18096) 2019-12-24 16:39:34 +05:30
Sun Howwrongbum
088be37e64 feat: consider expiry_date during Batch queries (#20065) 2019-12-24 12:29:25 +05:30
Rohit Waghchaure
c2a5f99a38 fix: incorrect consumed qty for partial purchase receipt in subcontracting 2019-12-20 13:01:02 +05:30
Rohit Waghchaure
8bd84b28ca fix: schedule date 2019-12-16 12:29:07 +05:30
Rohit Waghchaure
21fe97e723 fix: pricing rule not working for production discount 2019-12-16 11:15:53 +05:30
Nabin Hait
acdd5081da
fix: Service start and end date validation for deferred accounting (#19805) 2019-12-04 15:30:01 +05:30
Marica
c68a940aac fix: Item qty cannot be zero in Purchase Receipt (#19779) 2019-12-03 12:59:22 +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
Nabin Hait
a7d168c05f fix: merge conflict 2019-11-25 18:12:56 +05:30
Saqib
cd3976f7d2 Asset cancellation fix (#19671)
* fix: remove asset movement mandatory fields

* fix: label for reference doctype
2019-11-25 12:24:34 +05:30
Saqib
f37a46edea Fixed Asset Refactor Review fixes (#19665)
* 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:50 +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
Rohit Waghchaure
a831848074 fix: code cleanup 2019-11-20 19:42:27 +05:30
Rohit Waghchaure
eed30c6d8c fix: not able to select item in sales order 2019-11-20 19:42:11 +05:30
rohitwaghchaure
95270ad14b
Merge pull request #19619 from rohitwaghchaure/not_able_to_select_item_in_the_sales_order
fix: not able to select item in sales order
2019-11-19 19:40:11 +05:30
Rohit Waghchaure
248585b5a1 fix: code cleanup 2019-11-19 19:21:27 +05:30
Rohit Waghchaure
c42312ea12 fix: not able to select item in sales order 2019-11-19 19:06:51 +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
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
rohitwaghchaure
090f9a3dc9
Merge pull request #19533 from rohitwaghchaure/fixed_precision_issue_while_updating_qty_and_rate
fix: precision issue
2019-11-08 14:54:58 +05:30
Rohit Waghchaure
e93dc9f1cd fix: precision issue 2019-11-08 13:43:15 +05:30
Marica
e37a67245e fix: Sales and Purchase Invoice Status, Payment Reconciliation Credit/Debit Note (#19388) 2019-11-07 12:52:23 +05:30
Deepesh Garg
0bcf8b64f6
Merge pull request #19422 from marination/search-field
fix: Search field entries included in Item Link field query
2019-11-01 15:38:25 +05:30
rohitwaghchaure
81c217584a fix: purchase order issue, margin_rate_or_amount not there in the purchase documents (#19466) 2019-10-31 15:56:10 +05:30