Commit Graph

1066 Commits

Author SHA1 Message Date
Faris Ansari
1fe891b287 refactor: Replace Class.extend with native class 2021-04-23 08:04:00 +05:30
Rohit Waghchaure
4c089b5852 minor fixes 2021-03-07 12:17:59 +05:30
rohitwaghchaure
1aad27a539
Merge pull request #24612 from rohitwaghchaure/fixed-validation-for-job-card
fix: [minor] validation of job card in stock entry
2021-02-19 21:22:57 +05:30
Rohit Waghchaure
c697cb8b2d fix: validation of job card in stock entry 2021-02-18 15:10:12 +05:30
Nabin Hait
d826bee13a
fix: update qty in future sle (#24649)
* fix: update qty in future sle

* fix: validate cancellation due to ongoing reposting

* fix: process sle against current timestamp
2021-02-18 14:14:21 +05:30
Nabin Hait
7177579051
fix: Dependant sle logic fixes (#24489)
* fix: Dependant sle logic fixes

* fix: negative qty validation

* fix: Travis fixes
2021-02-02 22:03:07 +05:30
Suraj Shetty
055b81da7b Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2021-02-01 15:10:52 +05:30
Suraj Shetty
bbc6bfd3c3 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2021-01-19 09:34:06 +05:30
Rohit Waghchaure
56c7b554a6 fix: extra transferred qty has not consumed against work order 2021-01-14 11:54:32 +05:30
Kanchan Chauhan
511434190d
fix(work order): Actual start and end dates update (#24360)
Currently, even when the Work Order (without Operations) is completed and Stock Entries are there, the Actual Start Date and Actual End Date is not updated. 

For some reason need to db_set, then it updates the Actual Start Date and Actual End Date
2021-01-13 20:59:43 +05:30
Rushabh Mehta
7619d3d6d6 fix(merge): develop 2021-01-12 09:16:21 +05:30
marination
fab080c875 fix: Company Wise Valuation Rate for RM in BOM 2021-01-07 15:25:39 +05:30
Rohit Waghchaure
304100db3b fix: don't cancel job card if manufacturing entry has made 2020-12-24 16:36:37 +05:30
prssanna
ec959bc3b9 fix: override field_map for job card gantt 2020-12-22 12:32:36 +05:30
Nabin Hait
a77b8c9fcc
Repost item valuation (#24031)
* feat: Reposting logic for future finished/transferred item

* feat: added fields to identify needs to recalculate rate while reposting

* refactor: Set rate for outgoing and finished items

* refactor: Arranged fields in Stock Entry item table and added fields to identify finished and scrap item

* refactor: Arranged fields in Stock Entry item table and added fields to identify finished and scrap item

* refactor: Get outgoing rate for purchase return

* refactor: Get incoming rate for sales return

* test: Added tests for reposting valuation of transferred/finished/returned items

* feat: added incoming rate field in DN, SI and Packed Item table

* feat: get incoming rate for returned item

* fix: no error while getting valuation rate in stock entry

* fix: update stock ledger for DN and SI

* feat: update item valuation rate in PR and PI based on supplied items cost

* feat: SLE reposting logic for sales return and subcontracted item with test cases

* feat: update qty in future sle

* feat: repost future sle and gle via Repost Item Valuation

* fix: Skip unwanted function calling while reposting

* fix: repost sle for specific item and warehouse

* test: Modified tests for backdated stock reco

* fix: ignore cancelled sle in few methods

* feat: role allowed to do backdated entry

* feat: Show reposting status on stock valuation related reports

* fix: minor fixes

* fix: fixed sider issues

* fix: serial no fix related to immutable ledger

* fix: Test cases fixes related to perpetual inventory

* fix: Test cases fixed

* fix: Fixed reposting on cancel and test cases

* feat: Restart reposting item valuation

* refactor: Code cleanup using small functions and test case fixes

* fix: minor fixes

* fix: Raise on error while reposting item valuation

* fix: minor fix

* fix: Tests fixed

* fix: skip some validation ig gle made from reposting

* fix: test fixes

* fix: debugging stock and account validation

* fix: debugging stock and account validation

* fix: debugging travis for stock and account sync validation

* fix: debugging travis

* fix: debugging travis

* fix: debugging travis
2020-12-21 14:45:50 +05:30
Rushabh Mehta
2cd41bca06 fix(routes): desk to app 2020-12-18 13:17:58 +05:30
Prssanna Desai
421bfee874
Merge branch 'develop' into job-card-gantt-v13 2020-12-16 16:59:50 +05:30
prssanna
ff59f18012 fix: override field_map for job card gantt 2020-12-16 16:56:30 +05:30
Suraj Shetty
f2511c84b5 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-12-14 09:05:48 +05:30
Rohit Waghchaure
edb99d4e53 fix: incorrect stock quantity if 'Allow Multiple Material Consumption' has enabled 2020-12-12 16:03:07 +05:30
Rushabh Mehta
fec8dba16c fix(merge): merge develop 2020-12-08 16:23:09 +05:30
Nabin Hait
029b9c08dd
Update bom.py 2020-12-01 09:33:17 +05:30
Anurag Mishra
66e8a12d0f fix: KeyError 'sourced_by_supplier' 2020-11-30 17:53:28 +05:30
Rucha Mahabal
6b57cf3285
feat: Quality Inspection on Job Card (#23964)
* feat: Quality Inspection on Job Card

* fix(Job Card): quality inspection filter query

* fix: sider issues
2020-11-25 09:17:16 +05:30
rohitwaghchaure
5ab2e6c1ff
Merge pull request #23991 from pateljannat/job-card-operation-field-error
fix: job card error handling for operations field
2020-11-24 17:05:44 +05:30
pateljannat
b67ebc7636 fix: job card error handling for operations field 2020-11-24 15:37:30 +05:30
Rushabh Mehta
542bc01718 fix(minor): update routes 2020-11-18 15:00:34 +05:30
rohitwaghchaure
1c8c1d78e9
fix: default cost center in item master not set in stock entry (#23877)
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-11-15 09:40:44 +05:30
Rohit Waghchaure
4abc5657ab fix: not able to save bom 2020-11-13 22:18:48 +05:30
Shivam Mishra
bed717b442 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-11-12 11:32:59 +05:30
Jannat Patel
e008f85816
Merge branch 'develop' into production-planning-status-filter 2020-11-11 10:00:39 +05:30
pateljannat
d08c91673a fix: removed unnecessary filter options 2020-11-10 18:04:30 +05:30
Rohit Waghchaure
dd87bcfda0 fix: on save sequence id column override with workstation 2020-11-04 13:26:03 +05:30
Rohit Waghchaure
81b2c8ed60 fix: sequence id override with operation column 2020-11-04 13:10:03 +05:30
pateljannat
846ff323e2 feat: sales order status filter for production plan 2020-11-03 17:35:44 +05:30
Nabin Hait
b7285fdcad
Merge branch 'develop' into prod-plan-status 2020-10-29 18:58:32 +05:30
Marica
bf54ea9976
chore: (Production Plan) Simplify and fix translation in message popup (#23753) 2020-10-29 18:54:36 +05:30
marination
689b77d1ed fix: Don't show buttons if status is Completed 2020-10-26 16:28:39 +05:30
marination
097b32fe67 feat: Close Production Plan 2020-10-26 15:27:37 +05:30
Michelle Alva
b39c17dd55
fix: Typo/Grammatical fixes in Settings (#23612)
* fix(Stock Settings): Type/Grammatical fixes in Settings

* fix: grammatical fixes in manufacturing settings

* fix: typo fix in accounting settings

* fix: typo fixes in HR settings

* fix: typo fixes in buying settings

* fix: typo fixes in Selling Settings

* Update erpnext/accounts/doctype/accounts_settings/accounts_settings.json

Co-authored-by: Sagar Vora <sagar@resilient.tech>

* Apply suggestions from code review

Co-authored-by: Sagar Vora <sagar@resilient.tech>

* Apply suggestions from code review

Co-authored-by: Sagar Vora <sagar@resilient.tech>

* Update accounts_settings.json

Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Rushabh Mehta <rmehta@gmail.com>
Co-authored-by: Sagar Vora <sagar@resilient.tech>
2020-10-23 18:22:26 +05:30
rohitwaghchaure
93bbc52a68
feat: added sequence id in routing for the completion of operations sequentially (#23641)
* feat: added sequence id in routing for the completion of operations sequentially

* fix: translation syntax
2020-10-23 18:18:03 +05:30
Rohit Waghchaure
fa842e8774 fix: incorrect backflush qty in manufacture entry 2020-10-22 13:35:27 +05:30
Shivam Mishra
9d468a8daf Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-10-21 11:38:31 +05:30
Rohit Waghchaure
6471912216 fix: not able to do overproduction 2020-10-20 10:02:01 +05:30
rohitwaghchaure
21bf5e9b8e
Fixed incorrect operation time calculation develop (#23674)
* fix: incorrect operation time calculation for batch size

* Update test_work_order.py
2020-10-19 10:38:48 +05:30
rohitwaghchaure
e30397bf2e
Merge pull request #23668 from rohitwaghchaure/incorrect-work-order-qty-againt-production-plan-develop
fix: production plan incorrect work order qty (#23264)
2020-10-16 17:41:25 +05:30
rohitwaghchaure
f01856d7a9 fix: production plan incorrect work order qty (#23264)
* fix: production plan incorrect work order qty

* added test case

* Update test_production_plan.py
2020-10-16 15:19:23 +05:30
Shivam Mishra
55f52e8135 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-10-13 20:09:22 +05:30
Marica
c5e139a542
fix: Travis (#23606)
* fix: Rename `make_supplier_quotation` to `make_supplier_quotation_from_rfq` in missing places

* fix: Item Barcode and Test

* fix: Over Receipt on subcontracting test

* fix: POS Invoice and Loyalty Program Tests

* fix: POS serialized item test and subcontracting exploded items in PO

* fix: Subcontracting test considering sourced_by_supplier items

* fix: Make only one Additonal Salary List with overwrite set
2020-10-13 16:53:10 +05:30
Marica
aeba75cd08
Merge branch 'develop' into mr-ux 2020-10-12 15:17:32 +05:30