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

1221 Commits

Author SHA1 Message Date
Shivam Mishra
de68f74b4c chore: update all desk pages 2020-12-01 12:51:38 +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
Shivam Mishra
27e7c264f2 fix: link type 2020-11-30 14:58:16 +05:30
Shivam Mishra
61388d412b feat: update desk pages 2020-11-30 14:58:00 +05:30
rohitwaghchaure
10c168e257 fix: default cost center in item master not set in stock entry (#23877) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-11-30 14:58:00 +05:30
Rohit Waghchaure
d6a2b390dc fix: not able to save bom 2020-11-30 14:58:00 +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
f38abdeac0
Merge pull request #23994 from rohitwaghchaure/bom-stock-project-item-color-develop 
fix: bom stock report color showing always red
 2020-11-24 21:16:51 +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
Rohit Waghchaure
5a33f2c394 fix: bom stock report color showing always red 2020-11-24 16:59:36 +05:30
pateljannat
b67ebc7636 fix: job card error handling for operations field 2020-11-24 15:37:30 +05:30
rohitwaghchaure
f9a44000d9
Update bom_stock_report.js 2020-11-23 15:40:06 +05:30
Rohit Waghchaure
610d9ca649 fix: bom stock report color issue 2020-11-23 14:10:55 +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
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