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

1227 Commits

Author SHA1 Message Date
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
Deepesh Garg
d29dd58e89 fix: Validation 2020-04-02 21:29:59 +05:30
Deepesh Garg
625acab057 fix: Add duplicate item validation 2020-04-02 11:18:22 +05:30
rohitwaghchaure
98a91f489d
Merge pull request #21015 from marination/so-mr-mapping-uom 
fix: UOM fixes in Sales Order,Material Request & Production Plan
 2020-03-31 16:24:37 +05:30
rohitwaghchaure
7845961d46
Merge pull request #21017 from Alchez/dev-remove-same-item-validation 
feat: allow BOM to use same item as raw material (develop)
 2020-03-31 16:04:26 +05:30
rohitwaghchaure
d274923ae1
fix: "Qty To Manufacture" field as non mandatory in job card (#21081) 2020-03-31 15:28:31 +05:30
Deepesh Garg
4d9fe69ba5 fix: Test cases 2020-03-31 14:17:53 +05:30
Deepesh Garg
c014c802dd fix: Remove comments 2020-03-30 22:50:29 +05:30
Deepesh Garg
c33412b6ae feat: Link blanket order and quotation 2020-03-30 22:44:13 +05:30
Saqib Ansari
b345fe0fe9 chore: hyperlinks in cannot cancel message 2020-03-28 20:11:26 +05:30
Rohan
ea182051d3 fix: consumed qty values in work order 2020-03-26 15:32:01 +05:30
Rohan
4464a591ef fix: allow BOM to use same item as raw material 2020-03-20 18:49:08 +05:30
marination
73c8d23a79 fix: UOM fixes in Sales Order,Material Request & Production Plan 2020-03-20 17:52:28 +05:30
Deepesh Garg
9476170b09
Merge pull request #20994 from rohitwaghchaure/fixed_bom_comparision_issue_develop 
fix: bom comparison issue
 2020-03-19 10:55:14 +05:30
Rohit Waghchaure
d9469137cc fix: bom comparison issue 2020-03-19 10:07:27 +05:30
Rohit Waghchaure
dd13d0a9a9 fix: reserved qty for production issue for partial completion of work order 2020-03-19 09:29:17 +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
rohitwaghchaure
06dc6a527e
fix: bom replace tool issue (#20842) 2020-03-17 17:01:26 +05:30
Shivam Mishra
451382e08e feat: update desk pages 2020-03-12 16:34:34 +05:30
Shivam Mishra
1fd1852c6a
Merge branch 'develop' into yet-another-desk 2020-03-10 18:20:27 +05:30
Shivam Mishra
0310366d5a fix (cleanup): remove incomplete dependencies data 2020-03-05 11:28:40 +05:30
Shivam Mishra
1f151c1032 refactor: update restrict to domain data 2020-03-02 19:37:12 +05:30
Shivam Mishra
3f59af3ef1 feat: added base config for domains 2020-03-02 17:25:18 +05:30
Yugandhara
ce1f6a73e2 fix: Changes done to get valid sales order list on production plan form(#20609) 2020-02-15 16:31:53 +05:30
Yugandhara
e997168a23 fix: unused variable cdn removed 2020-02-15 16:14:46 +05:30
Yugandhara
af2b39891e fix: Changes done to get valid sales order list on sales order child table of production plan 2020-02-15 16:01:41 +05:30
abhijitkumbharIND
a67ae3ad31 fix: Production Plan | Get items from Sales Order not fetching grand total value. #20568 2020-02-11 16:45:59 +05:30
rohitwaghchaure
716a85d81a
Merge pull request #20485 from rohitwaghchaure/source_warehouse_for_the_work_order 
feat: added source warehouse field in the work order
 2020-02-03 16:32:19 +05:30
Rohit Waghchaure
adbe291498 feat: added source warehouse field in the work order 2020-01-31 13:09: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
rohitwaghchaure
da9a3936e1 fix: incorrect work order qty for sub assembly items (#20449) 2020-01-28 14:34:27 +05:30
Shivam Mishra
149b4e5985 chore: warn bom naming conflict (#20244) 
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2020-01-27 15:20:30 +05:30
abhijitkumbharIND
0eb6f06685 fix: Gives a 404 error when clicked on the Download Required Material button while the form is not saved (#20355) 2020-01-21 19:16:32 +05:30
abhijitkumbharIND
b2f08a7a42 fix: Gives a 404 error when clicked on the Download Required Material button while the form is not saved (#20355) 2020-01-21 19:16:32 +05:30
rohitwaghchaure
6ae61a1693 fix: incorrect number of gl entries issue (#20352) 2020-01-20 17:53:19 +05:30
Rohan
ef734ee850 fix: handle default value for batch size in BOM operation (#20328) 2020-01-17 11:45:54 +05:30
Nabin Hait
e321fbb0d5
fix: Multiple fixes based on testing on pre-release branch (#20301) 
* fix: Multiple fixes based on testing on pre-release branch

* fix: reload hr settings
 2020-01-16 13:37:25 +05:30
rohitwaghchaure
d821c58a5e fix: capacity planning validation (#20317) 2020-01-16 11:29:08 +05:30
Ishan Loya
fe0adc8b25 fix: read WIP warehouse from work order (#20131) 
* fix: read wip_warehouse from work order in stock entry even if skip transfer is checked

* fix: remove skip_transfer in stock entry

Related to #10753
 2019-12-30 12:19:08 +05:30
rohitwaghchaure
59a835602a fix: service item's cost showing incorrect amount in stock entry (#20106) 2019-12-30 11:42:06 +05:30
Ishan Loya
b2a1ae77ce Remove default BOM filter in Work Order (#20117) 
Not all companies use default BOM (e.g. construction companies, etc.)
 2019-12-27 17:06:34 +05:30
rohitwaghchaure
6e8a9286c2 fix: multiple stock entry issues for the work order (#18686) 
* fix: multiple stock entry issues for the work order

* Update work_order.py

* Update work_order.py

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2019-12-24 18:53:32 +05:30
Rohit Waghchaure
4203eb4ee1 fix: not able to make work order from BOM 2019-12-17 18:19:26 +05:30
rohitwaghchaure
3772b2e03e
Merge pull request #19962 from rohitwaghchaure/allow_overproduction_against_work_order 
fix: now allow to over production against work order
 2019-12-17 17:16:24 +05:30
Rohit Waghchaure
b5bf22a821 fix: now allow to over production against work order 2019-12-16 16:53:00 +05:30
Rohit Waghchaure
197a99ee35 fix: incorrect children boms fetched 2019-12-16 16:20:47 +05:30
rohitwaghchaure
797481f9d5
Merge pull request #19802 from rohitwaghchaure/job_card_calendar_new_enhancement 
fix: Manufacturing UX, added calendar view for job card
 2019-12-11 13:01:16 +05:30
Rohit Waghchaure
502189913a fix: 'NoneType' object is not iterable 2019-12-07 14:10:11 +05:30
Rohit Waghchaure
8ab8376975 fix: Manufacturing UX, added calendar view for job card 2019-12-06 17:40:09 +05:30
rohitwaghchaure
cfbf895876
Merge pull request #19498 from marination/stock_entry_bom_fetch 
feat: Provision to fetch items from multiple BOMs in Stock Entry
 2019-12-04 21:44:47 +05:30
ronelvcabrera
370cdc0170 feat(Sales/Purchase Order): optional to reference a Blanket Order (#19612) 2019-12-04 16:07:11 +05:30
rohitwaghchaure
36b60dbbef
Merge pull request #19441 from rohitwaghchaure/capacity_planning_for_workstataion_feature 
fix: capacity planning back
 2019-12-03 15:23:06 +05:30
Anurag Mishra
de5237fbd5 refactor: Report BOM Sock Calculated (#19431) 2019-12-02 17:08:12 +05:30
rohitwaghchaure
ce32f9a361
Merge branch 'develop' into capacity_planning_for_workstataion_feature 2019-12-02 11:29:06 +05:30
Rohit Waghchaure
8c6bc34bc4 added test cases 2019-11-29 18:42:20 +05:30
rohitwaghchaure
c9afe2f707
Merge pull request #19602 from Anurag810/bom-explorer-report-fix 
fix: Raw material qty depending on the quantity of the parent BOM
 2019-11-29 16:18:30 +05:30
Rohit Waghchaure
8b599f2bc9 fix: capacity planning back 2019-11-29 14:09:30 +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
Rohit Waghchaure
9326fb78f2 fix: BOM UX 2019-11-25 18:56:18 +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
Anurag Mishra
c0d8233a8b fix: Raw material qty depending on the quantity of the parent BOM 2019-11-18 15:45:53 +05:30
rohitwaghchaure
6424416886 fix: sales order item shwoing incorrect produced qty (#19584) 2019-11-15 14:18:45 +05:30
rohitwaghchaure
16f6ca12a7
Merge pull request #19023 from Alchez/dev-work-order-bugs 
fix: Work Order operating cost re-calculation on client-side (develop)
 2019-11-15 11:19:10 +05:30
rohitwaghchaure
e942f99897
Update work_order.js 2019-11-14 15:26:18 +05:30
rohitwaghchaure
d064505ebe fix: incorrect produced qty in the production plan (#19569) 2019-11-13 18:17:48 +05:30
Rohan
4d27b50437
Merge branch 'develop' into dev-work-order-bugs 2019-11-13 13:09:12 +05:30
MorezMartin
4fa6194009 feat: [production_plan -> fetching item description] Fetch item description from Material Request or Sales Order (#19541) 
* Change packed item

* Remove description field on update_packed_items

* add possibility to modify description on packed items

* Fetch description from Material Request or Sales Order in production plan, add the possibility to modify the description un production plan

* sync with fork

* Fetch description from Material Request or Sales Order in production plan, Add the possibility to modify description in production plan

* code cleaning syncing fork

* code cleaning syncing fork

* code cleaning syncing fork

* code cleaning syncing fork

* rewied and add item_details.description in case of blank field
 2019-11-12 18:19:01 +05:30
rohitwaghchaure
df75b7693a fix: added description, uom fields in material request plan item table (#19463) 2019-11-11 10:59:10 +05:30
Deepesh Garg
7a23057eab feat: Enhancement in landed cost voucher (#19252) 
* feat: Enhancement in landed cost voucher

* fix: Make GL entries based on ledgers in Landed cost voucher

* fix: Patch to update expense account in Landed Cost Voucher and Stock Entry

* fix: Ability to select expense account in Stock Entry

* fix: Renaming and test case fixes

* fix: Test Cases

* fix: Additional cost in Stock Entry

* fix: Changed filters and test case fixes

* fix: Upadte filters in stokc entry expense account filter

* fix: company filter
 2019-11-08 12:52:54 +05:30
Suraj Shetty
7508896bfb perf: Optimise BOM Update Tool (#19236) 
* perf: Optimize BOM update tool
- Remove redundant traverse_tree calls
- Cache bom_children data

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>

* fix: Replace get_list with db.sql

* fix: Enable versioning for updated BOM

* fix: Directly save doc_before_save from bom obj instead of using  load_doc_before_save

* fix: recurssion check performance issue
 2019-11-06 18:46:57 +05:30
Saqib
01c19d3b93 internal issues (#19496) 
* fix: user remark mandatory in quick entry but not in form

* fix: preview salary slip btn showing in draft and unsaved states

* minor: removed unecessay comma

* fix: department analytics report showing departments of all companies
 2019-11-06 14:41:16 +05:30
Rohan
f527713b89
Merge branch 'develop' into dev-work-order-bugs 2019-11-06 11:39:24 +05:30