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

1199 Commits

Author SHA1 Message Date
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
Rushabh Mehta
2bef986f14
Merge pull request #23450 from michellealva/jc 
fix: Change Error Message in Work Order
 2020-10-12 15:07:21 +05:30
Kanchan Chauhan
654c36ea99 feat: Supplier Sourced Items in BOM 2020-10-09 22:05:03 +05:30
michellealva
3aedeb642f fix: Change Error Message in Work Order 2020-09-29 12:54:55 +05:30
Shivam Mishra
9a4d603403 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-09-25 11:44:37 +05:30
marination
90d9d80ef9 fix: More MR UX fixes 2020-09-19 00:43:53 +05:30
rohitwaghchaure
f898c807b8
Merge pull request #23227 from rohitwaghchaure/multiple-job-card-fixes 
Fix: job card issues
 2020-09-02 11:41:37 +05:30
Rohit Waghchaure
86a190652e fix: incorrect job card timer issue 2020-09-02 11:04:56 +05:30
Rohit Waghchaure
d0aafece32 fix: incorrect completed qty against operation in work order if workstation is different in job card 2020-08-31 13:41:17 +05:30
Rohit Waghchaure
a5963e1b2c fix: user created manual job card not linking job card operations with work order operations 2020-08-31 13:40:55 +05:30
Rohit Waghchaure
e7ab53a711 fix: completed qty not updated in work order 2020-08-31 13:40:01 +05:30
Suraj Shetty
f39bb116cc Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-08-27 19:27:49 +05:30
Suraj Shetty
b6ebcd7559 refactor: Replace darkgray indicator with gray indicator 2020-08-27 18:57:18 +05:30
Rucha Mahabal
c8eea556d1 fix: BOM Update Tool failing due to Too Many Writes error 2020-08-27 18:54:25 +05:30
prssanna
744169833c fix: replace indicator color darkgrey with darkgray 2020-08-27 17:06:10 +05:30
Rucha Mahabal
d43d1408cf fix: conversion factor for BOM exploded item rate 2020-08-25 17:13:05 +05:30
Suraj Shetty
6f9f40992c Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-08-23 16:33:50 +05:30
Prssanna Desai
5c0439f768
fix: set correct default value from from date in downtime analysis report (#22903) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2020-08-10 11:12:52 +05:30
Suraj Shetty
1923ef052c
refactor: Format and sanitise user inputs to search queries. (#22913) 
* refactor: Sanitize whitelisted method inputs

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* refactor: Format and sanitize tax_account_query inputs

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* refactor: Validate and sanitize search inputs via decorator

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* style: Minor formatting fix

* refactor: Validate and sanitize search inputs using decorator

* fix: Typo

* fix: Remove unwanted import statement

* refactor: Repalce validate_and_sanitize_search_inputs() with validate_and_sanitize_search_inputs

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-08-05 19:42:25 +05:30
Shivam Mishra
1358efe896 feat: update icons 2020-07-23 17:02:32 +05:30
Prssanna Desai
f098221550
feat: Exported manufacturing dashboard (#22626) 
* feat: exported Manufacturing Dashboard

* fix: update use_report_chart fieldname

* fix: add dynamic filter for company in Produced Quantity chart
 2020-07-22 16:58:17 +05:30
rohitwaghchaure
7c08ff7572
Merge pull request #22596 from marination/exploded-item-rate 
fix: Exploded Item Rate in BOM
 2020-07-15 14:30:27 +05:30
Michelle Alva
5d514fe4df
fix: grammatical fixes in module onboarding (#22580) 
* fix: grammatical fixes in module onboarding

* fix: more grammatical changes for consistency

* fix: Reorder Stock Onboarding

* fix: update success message

* fix: change order of stock onboarding steps

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-07-08 14:25:51 +05:30
marination
4355d3cf0f fix: Exploded Item Rate 2020-07-06 23:15:08 +05:30
Chinmay D. Pai
ed0bb20e6f
chore: add query functions to whitelist 
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2020-07-02 12:35:41 +05:30
Nabin Hait
fdbd10f193
fix: Dashboard label in Projects and Assets module (#22517) 2020-06-30 09:25:17 +05:30
rohitwaghchaure
7056cd3782
fix: manufacturing dashboard grammar (#22510) 
* fix: manufacturing dashboard grammar

* Update manufacturing.json
 2020-06-30 08:20:03 +05:30
marination
0f056ec51d fix: Sales Order to MR test failing 2020-06-26 14:12:11 +05:30
marination
c8f590bc8f fix: Handling Empty tables in Production Plan 2020-06-25 21:30:45 +05:30
rohitwaghchaure
8d856659af refactor: hide company currency fields in the routing (#22267) 
(cherry picked from commit fd3ff6be18b0bd5accc88aea22e3adfe48e62aff)
 2020-06-17 05:22:45 +00:00
Deepesh Garg
9df4532d14 fix: Travis(develop) 2020-06-11 21:33:43 +05:30
rohitwaghchaure
6debdc89c2
Merge pull request #22121 from rohitwaghchaure/error-report-exponential-smoothing-report 
fix: 'ForecastingReport' object has no attribute 'total_demand'
 2020-06-08 10:30:19 +05:30
Rohit Waghchaure
5a82276389 fix: 'ForecastingReport' object has no attribute 'total_demand' 2020-06-05 13:56:20 +05:30
Rohit Waghchaure
404ed88c0c fix: routing operations not added sequentially in the BOM 2020-06-04 14:46:50 +05:30
rohitwaghchaure
7544160374
fix: routing operations table is blank on pull of operations in BOM (#22039) 2020-05-29 21:27:24 +05:30
Shivam Mishra
6621e22c02
refactor: clean up desk pages (#22004) 
* refactor: clean up desk pages

* refactor: update label for CRM
 2020-05-28 14:48:50 +05:30
rohitwaghchaure
063d344000
Merge pull request #21998 from rohitwaghchaure/fixed-label-for-date 
fix: labels for date in manufacturing reports
 2020-05-28 12:09:02 +05:30
Rohit Waghchaure
b86c0eb404 fix: labels for date in manufacturing reports 2020-05-28 12:07:13 +05:30
Rohit Waghchaure
5226403b62 refactor: display draft job card as Open job card 2020-05-28 10:15:01 +05:30
rohitwaghchaure
7320a72237
Merge pull request #21991 from rohitwaghchaure/fixed-forecasting-data-and-changed-columns 
refactor: showing the order's data for past period
 2020-05-28 09:56:47 +05:30
Rohit Waghchaure
234a55c6bc refactor: showing the order's data for past period 2020-05-28 09:55:24 +05:30
rohitwaghchaure
7ac731dd4f
fix: raw material warehouse in Production Planning Report (#21982) 2020-05-27 21:53:17 +05:30
Shivam Mishra
cb1a7d0fbc fix: use get_datetime instead of getdate 2020-05-27 20:36:28 +05:30
Shivam Mishra
8fcbf1b90e
fix: compare start and end time to prevent negative diff (#21974) 
* fix: compare start and end time to prevent negative diff

* feat: parse date when comparing
 2020-05-27 20:31:30 +05:30
Deepesh Garg
df5f8528e7
Merge pull request #21957 from nabinhait/fix344 
fix: label changed in production plan
 2020-05-27 18:42:12 +05:30
rohitwaghchaure
29bd1c3968
Merge pull request #21960 from rohitwaghchaure/fixed-filters-for-manufacturing-reports 
fix: filters for the manufacturing reports
 2020-05-27 15:38:51 +05:30
Shivam Mishra
45571b99a8 feat: added tour to manufacturing settings 2020-05-27 15:36:59 +05:30
Rohit Waghchaure
cb1a910538 fix: filters for the manufacturing reports 2020-05-27 15:26:40 +05:30
Nabin Hait
07388495f3 fix: label changed in production plan 2020-05-27 12:59:03 +05:30
rohitwaghchaure
07b56610dd
Merge pull request #21946 from rohitwaghchaure/fixed-v13-beta-2-issues-develop 
fix: manufacturing dashboard and work order summary chart
 2020-05-26 23:19:57 +05:30
Rohit Waghchaure
1e04b455f0 fix: manufacturing dashboard and work order summary chart 2020-05-26 23:14:21 +05:30
rohitwaghchaure
7978907cc8
feat: BOM template (#21262) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-05-21 18:10:13 +05:30
Rohit Waghchaure
feaf5c7edb fix: dict object has no attribute append 2020-05-21 14:08:25 +05:30
Marica
1a6dcd7f45
fix: plc conversion rate set infinitely (#21820) 2020-05-21 12:07:43 +05:30
rohitwaghchaure
df78e29957
Merge pull request #21724 from rohitwaghchaure/production-forecasting 
feat: production forecasting using exponential smoothing method
 2020-05-20 12:30:56 +05:30
Rohit Waghchaure
841a8db5d1 updated manufacturing desk 2020-05-20 12:06:07 +05:30
Nabin Hait
9d04c06c62 fix: HR dashboard and onboarding 2020-05-20 12:05:03 +05:30
Rohit Waghchaure
e6147ed9bc feat: production forecasting using exponential smoothing method 2020-05-20 11:31:06 +05:30
rohitwaghchaure
aa85e511da
feat: Production Planning Against Sales Order/Material Request/Work Order (#21763) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-05-19 19:51:45 +05:30
Shivam Mishra
31f00b6052 refactor: rename dashboards in desk page 2020-05-19 15:56:47 +05:30
rohitwaghchaure
65c90959d1
fix: renamed manufacturing dashboards to manufacturing (#21776) 2020-05-19 15:54:24 +05:30
Rohit Waghchaure
84011b79d1 fix: updated manufacturing onboarding and desk 2020-05-19 13:00:54 +05:30
Nabin Hait
f2fb9368db fix: manufacturing dashboard 2020-05-19 12:32:39 +05:30
rohitwaghchaure
be750096ed
fix: bom incorrect price list rate for raw material if price list currency is different from company currency (#21585) 
* fix: bom incorrect price list rate for raw material if price list currency is different from company currency

* fixed test cases

* fixed base_rate calculation and added plc_conversion_rate trigger
 2020-05-18 14:23:30 +05:30
Rohit Waghchaure
1c9210b303 made changes in the dashboards, renamed number cards 2020-05-18 11:57:25 +05:30
Rohit Waghchaure
366bce678f added onboarding for manufacturing 2020-05-18 11:57:25 +05:30
Rohit Waghchaure
34f4a2398b feat: manufacturing dashboards 2020-05-18 11:57:25 +05:30
Anurag Mishra
36aea71fd7 fix: new dashboard and report 2020-05-13 10:47:36 +05:30
rohitwaghchaure
5abccc1a61
Merge pull request #21601 from rohitwaghchaure/fix-completed-qty-in-work-order 
fix: work order operation completed qty
 2020-05-11 07:07:28 +05:30
Türker Tunalı
2ba89ffd48 fix: Job Card submitted qty 
Update Operation Status function in work order was throwing exception without checking the "Overproduction Percentage For Work Order" setting. To submit Job Card qty for more than the Work Order's "To Manufacture Qty" we need to apply this fix.

(cherry picked from commit 9bd6d119c405f2ace6c93d53647af140c6543542)
 2020-05-07 10:51:35 +00:00
Rohit Waghchaure
6e95d248e3 fix: work order operation completed qty 2020-05-05 16:35:45 +05:30
Deepesh Garg
6df581f78b
Merge pull request #21375 from marination/commonify-warehouse-autofill 
chore: Commonify auto-filling warehouses in child tables
 2020-05-03 20:33:45 +05:30
Nabin Hait
da17f9cb05
feat: Run MRP at parent level in the production plan (#21545) 
* enhance: provision to make material request from other location

* fix: source warehouse for material transfer from production plan

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2020-05-01 18:16:25 +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
Nabin Hait
ad16e61bc2
fix: Valid warehouse in woocommerce syncing and other small fixes (#21407) 
* fix: Valid warehouse in woocommerce syncing

* fix: dmall fixes in gross & net profit report

* fix: company is required for getting party details

* fix: None issue while getting raw material rate based on last purchase rate
 2020-04-25 14:52:05 +05:30
rohitwaghchaure
55102f455f
Merge pull request #21401 from rohitwaghchaure/fixed-taget-warehouse-mandatory-issue 
fix: make target warehouse field mandatory while saving the work order
 2020-04-25 01:19:19 +05:30
Rohit Waghchaure
5460691c8f fix: make target warehouse field mandatory while saving the work order 2020-04-24 23:55:33 +05:30
rohitwaghchaure
168babfebc
fix: bom update cost issue (#21372) 
* fix: bom update cost is not working

* added test case for bom cost
 2020-04-23 09:48:50 +05:30
rohitwaghchaure
e8a651bc00
fix: BOM stock report (#21380) 2020-04-23 09:45:09 +05:30
marination
8a30cb2565 chore: Commonify autofilling warehouses in child tables 2020-04-23 00:18:21 +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
Rohit Waghchaure
250daa3f94 fix: job card time issue 2020-04-17 00:50:00 +05:30
Shivam Mishra
ebcc46d837
feat: updated desk pages (#21138) 2020-04-10 18:52:05 +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
Deepesh Garg
0f25a40421 Merge branch 'develop' of https://github.com/frappe/erpnext into quotation_blanket_order 2020-04-02 21:30:53 +05:30