Commit Graph

1326 Commits

Author SHA1 Message Date
Saqib
fff00cee3a
chore: fix error message (#21593)
* chore: fix error message

* chore: add row idx
2020-05-05 16:14:17 +05:30
Marica
5e3d8050aa
fix: Handle rows with same item code from Purchase Receipt to Invoice. (#20724)
* fix: Handle rows with same item code from Purchase Receipt to Invoice.

* fix: Added patch, fixed tests, fixed delivery note behaviour

* chore: Added comments amd fixed typo

* fix: Added patch to patches.txt

* fix: Patch fix and simplification, json timestamp updation.

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-05-05 14:37:39 +05:30
Marica
1c8cbd07b8
fix: variable referenced before assignment (#21560) 2020-05-02 17:55:15 +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
rohitwaghchaure
28a4880b48
fix: added validation to not allow to select expired batch (#21455) 2020-04-28 13:01:43 +05:30
Marica
299e217668
fix: Blanket Order in SO/PO child tables (#21442) 2020-04-28 13:00:04 +05:30
Deepesh Garg
525204bc50
feat: Payment allocation based on payment terms (#20945)
* feat: Payment allocation based on payment terms

* fix: Add desccription for checkbox

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-23 16:07:36 +05:30
rohitwaghchaure
6fa6caf46c
fix: patch and validation message to fix target warehouse issue (#21371) 2020-04-23 09:46:29 +05:30
Rucha Mahabal
eaa956b994
feat(Healthcare): Rehabilitation Module (#21216)
* feat: added rehab sub-module doctypes

* feat: rehab module

* feat: prescribe procedures in Patient Encounter

* feat: create Therapy Plan on Encounter submission

* feat: manage item for Therapy Type

* feat: book appointments, get prescribed therapies for Therapy Sessions

* feat: invoice Therapy Sessions

* feat: plan completion progress bar and exercise countsindicators

* feat: Motor Assessment Scale

* feat: add editable card view for exercise steps

* fix: add rehab in healthcare desk page

* fix: card deletion not working when child table is hidden

* feat: automatically fetch therapies according to Body Part

* fix: added tests for Therapy Type and Plan

* fix: add exercises according to body parts in Therapy Type

* fix: label for Exercise Instructions

* fix: exercise cards css

* feat: add dashboard for Therapy Plan

* feat: Patient Assessment Template and Patient Assessment

* feat: add title fields in Therapy Plan and Session

* fix: remove Motor Assessment Scale

* fix: fetch assessment description

* feat: create Patient Assessment from Therapy Session

* fix: anti pattern code

* fix: update desk page

* fix: exercise card rendering

* fix(test): filter out disabled Items in test_mapper

* fix: get stock uom from Stock Settings for Therapy Type Item creation

* fix: multiline SQL query

* fix: permissions for DocTypes

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-22 13:07:12 +05:30
Nabin Hait
7eaa7f2e41
fix: requested qty for customer provided item and rate for sales (#21299)
* fix: requested qty for customer provided item and rate for sales

* fix: requested qty for material transfer

* fix: customer provided item can be sales item

* fix: requested qty test cases
2020-04-17 10:52:28 +05:30
Saqib Ansari
f53299e98a fix: warehouse unset when cannot find item warehouse
* cannot set delivery date when all items gets deleted and new are added
2020-04-15 22:10:48 +05:30
Deepesh Garg
dd78eb3842
Merge pull request #21252 from nextchamp-saqib/tax-breakup-for-cn
fix: show positive taxes in credit notes
2020-04-14 12:41:25 +05:30
Saqib Ansari
10a6a2d77f fix: show positive taxes in credit notes 2020-04-13 16:40:13 +05:30
Deepesh Garg
5e274965cc
Merge pull request #21201 from marination/serial-no-status
fix: Added Status field in Serial No for filter and report builder
2020-04-10 20:48:06 +05:30
Michelle Alva
7f2477b72c
fix: better error message due date
show better error message payment schedule due date
2020-04-09 17:23:23 +05:30
rohitwaghchaure
cf17809c3f
Merge pull request #21156 from marination/mr-customer-provided-to-stock-entry
fix: Mapping Customer Provided Material Request to Stock Entry
2020-04-09 13:18:25 +05:30
marination
86e8b2a1c6 fix: Status field in Serial No for filter and report builder 2020-04-08 15:38:28 +05:30
Saqib
562fd0eab0
fix: purchase return are allowed even when assets are not cancelled (#20797)
* fix: purchase return are allowed even when assets are not cancelled

* chore: test case

* fix: error message

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-08 12:11:40 +05:30
Suraj Shetty
da6806e6bc
fix: Translation strings with trailing spaces (#21192) 2020-04-08 09:32:41 +05:30
rohitwaghchaure
05ac7213b3
fix: allow to make BOM against template item (#21146)
* fix: allow to make BOM against template item

* Update queries.py

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-06 10:17:57 +05:30
marination
2a9a5352bb fix: Test Cases and block expense on outward entry
- Throw error if rate present against Customer Provided Item in DN and SI
- Added test cases for Sales Invoice and Delivery Note
- Allow SI and DN with 0 rate in Test
2020-04-03 18:25:21 +05:30
marination
fd04e96bdd fix: Mapping Customer Provided Material Request to Stock Entry
- Fixed inability to map Material Request to Stock Entry
- Commonified Customer Provided Item validation
2020-04-03 15:46:48 +05:30
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