Ankush Menat
0a3dd3e954
fix: bom item query #27890
...
fix: bom item query
2021-10-11 12:10:33 +05:30
Alan
ece446ffe5
fix: update variant qty in BOM, Create Work Order dialog ( #27686 )
2021-10-01 20:32:13 +05:30
Noah Jacob
5c249decbb
fix(ux): added exception of template item in filters ( #27560 )
2021-09-27 22:34:27 +05:30
Frappe PR Bot
2af6ea68ae
fix: remove unknown field employee_name from query (bp #27634 )
...
* fix: remove unknown field employee_name from query
* fix: remove unknown fieldname
Co-authored-by: root <root@vultr.guest>
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
(cherry picked from commit 9ebabb86b3d28e2c94eb2761f1864c88b6eb1e59)
Co-authored-by: Bhavesh Maheshwari <34086262+bhavesh95863@users.noreply.github.com>
2021-09-21 20:33:09 +05:30
Marica
9110223341
fix: (ux) Use subassembly schedule date while making WO from Prod Plan ( #27628 )
...
- Set subassemply WO's planned start date from Production Plan
2021-09-21 16:50:14 +05:30
Ankush Menat
78fe92542c
fix(ProdPlan): Get SubAssy Items does not work ( #27537 )
...
* fix(ProdPlan): Get SubAssy Items does not work
This button wasn't working unless the document was saved already.
* fix: make form dirty when subassy item are fetched
2021-09-16 15:34:50 +05:30
rohitwaghchaure
c5a77f60ed
feat: provision to add scrap item in job card ( #27483 )
2021-09-15 16:45:57 +05:30
rohitwaghchaure
2e2985e4f1
fix: calculate operating cost based on BOM Quantity ( #27464 )
...
* fix: calculate operating cost based on BOM Quantity
* fix: added test cases
2021-09-15 00:37:41 +05:30
Ankush Menat
fea51f4082
chore: isort
...
[skip ci]
2021-09-14 19:04:47 +05:30
marination
469bb8d977
test: Work Order Material Transfer against Job Card
...
- Tests for multiple items transfer and excess transfer against JC
- Remove unused __future__ imports
- Changed Copyright year
- Sider: (js) Added space before if
2021-09-14 16:27:39 +05:30
marination
9520215e2b
feat: Handle Excess/Multiple Item Transfer against Job Card
...
- Hide MR/Material Transfer buttons in JC if cancelled
- Show MR/Material transfer buttons if pending to transfer or excess transfer allowed
- Renamed ‘Transferred Qty’ to ‘FG Qty from Transferred Raw Materials’ in JC
- Set status to Completed in JC in case of excess transfer too
- During excess transfer against JC, avoid negative ‘For Quantity’. Set to 0 instead
- Job card section and excess transfer allowance checkbox in Manufacturing Settings
- Renamed ’Allow Multiple Material Consumption’ to ‘Allow Continuous Material Consumption’ (fiedname is same)
- Secured denominator variables in `get_transfered_raw_materials` to avoid ZeroDivisionError
2021-09-14 12:33:21 +05:30
Ankush Menat
678335f8ac
fix: job card overlap unknown column jc.employee
( #27403 )
...
* fix: incorrect query for job card overlap
* test: employee overlap in job cards
* test: simplify/refactor job card tests
2021-09-09 12:24:23 +05:30
rohitwaghchaure
295020451f
fix: added delivery date filters to get sales orders in production plan ( #27367 )
2021-09-08 19:28:30 +05:30
Alan
81d3524d27
fix: auto complete sales order rows in production plan ( #27352 )
...
* fix: auto complete sales order rows in production plan
* fix: sider
2021-09-08 16:48:42 +05:30
Chillar Anand
915b34391c
chore: Clean up imports ( #27302 )
...
* chore: Added isort to pre-commit config
* chore: Sort imports with isort
* chore: Clean up imports with pycln
* chore: Sort imports with isort
* chore: Fix import issues
* chore: Clean up sider issues
* chore: Remove import errors from flake8 ignore list
* chore: Clean up lint issues
2021-09-02 16:44:59 +05:30
Ankush Menat
81eb6fde07
Merge pull request #27288 from ankush/strict_linting
...
chore: cleanup linting errors and introduce strict linting checks
2021-09-01 19:32:49 +05:30
rohitwaghchaure
2a8cd05b44
fix: production plan UX and validation message ( #27278 )
2021-09-01 19:16:03 +05:30
Ankush Menat
b147b85e6a
chore: whitespace / eof fixes
2021-09-01 16:57:21 +05:30
Ankush Menat
010060d92e
chore: correct indentation
2021-09-01 15:02:29 +05:30
rohitwaghchaure
e6799d78ef
fix: operation time auto set to zero ( #27188 )
2021-08-27 10:46:45 +05:30
Frappe PR Bot
a1737c9a0c
fix: Production Plan: load document defaults for plan items & remove name column from listview ( #26584 ) ( #27184 )
...
(cherry picked from commit 69d88a921273c9e0ea29d7131232686a0be7bb78)
Co-authored-by: Richard Case <64409021+casesolved-co-uk@users.noreply.github.com>
2021-08-26 23:04:54 +05:30
Noah Jacob
422f67a4c9
refactor: update manufacturing module onboarding ( #26945 )
...
* refactor: updated manufacturing onboarding cards
* refactor: added form tours
* refactor: updated form tours and card descriptions
* Fix: Case of description
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-08-26 21:40:48 +05:30
Ankush Menat
ae55eab599
chore: remove deprecated and empty QUnit tests ( #27179 )
...
* chore: remove deprecated and empty QUnit tests
* ci: fix UI test config
Testing library was added on Frappe, in order to reuse command testing
library has to be installed during setup process.
2021-08-26 20:43:06 +05:30
Ankush Menat
c07dce940e
fix: don't allow BOM's item code at any level of child items ( #27157 )
...
* refactor: bom recursion checking
* fix: dont allow bom recursion
if same item_code is added in child items at any level, it shouldn't be allowed.
* test: add test for bom recursion
* test: fix broken prodplan test using recursive bom
* test: fix recursive bom in tests
2021-08-26 18:33:42 +05:30
18alantom
b389b8c3ad
fix: prevent over riding scrap table values, name kwargs, set currency
2021-08-26 13:15:57 +05:30
18alantom
e20d21924c
Merge branch 'develop' into feat-bom-process-loss-fp
2021-08-26 13:05:59 +05:30
rohitwaghchaure
ad45ddcabe
fix: sequence of sub-operations in job card ( #27138 )
2021-08-25 20:07:18 +05:30
18alantom
95a2565d86
fix: correct value in test
2021-08-24 20:18:53 +05:30
18alantom
aff9aee29c
Merge branch 'develop' into feat-bom-process-loss-fp
2021-08-24 20:15:51 +05:30
18alantom
c3ce3f918d
fix: remove spurious function 'toggle_operations'
2021-08-24 20:15:19 +05:30
18alantom
8f73d587f9
feat: process loss report, fix set pl query condition
2021-08-24 18:38:23 +05:30
18alantom
b58853e89d
feat: add procss_loss_qty field in work order
2021-08-24 16:11:29 +05:30
18alantom
7fb08173b5
fix: reword error messages, fix test values
2021-08-24 15:01:38 +05:30
rohitwaghchaure
6106a635f8
Merge branch 'develop' into fix-scrap-items-updation
2021-08-24 12:10:04 +05:30
Alan
62c590261c
refactor: rectify typo ( #27057 )
...
[skip ci]
2021-08-20 18:21:09 +05:30
18alantom
6ef16ee4fb
fix: update scrap table item details; typo
2021-08-20 12:24:13 +05:30
Noah Jacob
f13315809e
refactor: renamed varint_item_code to variant_item_code ( #27025 )
2021-08-19 20:28:30 +05:30
Alan
9225f02599
fix: pass planned start date to created work order ( #27031 )
...
* fix: pass planned start date to created workorder
* test: production plan to work order start date
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-08-19 18:49:20 +05:30
Alan
09f34e558e
fix: set production plan to completed even on over production ( #27027 )
2021-08-19 15:51:36 +05:30
Ankush Menat
4551d7d602
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
18alantom
cc177f3415
fix: wo tests, sider, account for pl in se validation
2021-08-17 16:49:00 +05:30
18alantom
2670adc0c0
test: check manufacture completion qty in se and wo
2021-08-17 16:40:44 +05:30
18alantom
ad73d3fbfb
refactor: validation error message formatting
2021-08-17 16:40:16 +05:30
18alantom
23ef51a981
fix: sider
2021-08-17 16:40:05 +05:30
18alantom
47a4a3d888
refactor: polyfill ??
2021-08-17 16:39:05 +05:30
18alantom
55acb2e843
fix: sider
2021-08-17 16:37:34 +05:30
18alantom
cdf253aeb4
fix: add more validations, remove source wh req for pl item
2021-08-17 16:36:32 +05:30
18alantom
8ecb146231
test: add bom tests for process loss val, add se test for qty calc
2021-08-17 16:36:24 +05:30
18alantom
7433b97106
refactor: shift auto entry of is process loss check, update validations
2021-08-17 16:35:16 +05:30
18alantom
984c97ed4e
feat: add is process loss autoset and validation
2021-08-17 16:28:54 +05:30
18alantom
b6dc0efa27
feat: add provision for process loss in manufac
2021-08-17 16:23:19 +05:30
Rohit Waghchaure
eb1e3181a4
fix: conflicts while merging brnach version-13 to develop
2021-08-17 10:53:19 +05:30
Shariq Ansari
b32c2fa561
fix: updated erpnext wspace json files ( #26380 )
...
* fix: updated erpnext wspace json files
* fix: updated wspace json files
* fix: updated wspace json files
* fix: removed padding code from wspace json files
* fix: Updated restrict_to_domain in wspace json
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2021-08-13 12:19:16 +05:30
Frappe PR Bot
210441d9b5
fix: price list with 0 value are ignored (bp #26655 )
...
* fix: price list with 0 value are ignored
Steps to reproduce:
1. Create 2 item price for two different supplier. One of them should be
zero.
2. Create PO
3. Add supplier with non-zero price and add item.
4. change supplier. Price won't change. If price was non-zero it
would've changed.
Root cause: falsiness check instead of null value check is used for
checking if price list value exists. 0 is evaluated as false.
* refactor: make get_price_list_rate function pure
(cherry picked from commit 16d4de5130
)
Co-authored-by: Ankush <ankush@iwebnotes.com>
2021-08-09 11:34:33 +05:30
Frappe PR Bot
3dfbf19e8f
fix: allow alternative items when using job card (bp #26724 )
...
(cherry picked from commit 7e0c57fa3f
)
Co-authored-by: Ankush <ankush@iwebnotes.com>
2021-08-09 11:33:55 +05:30
Ankush
7e0c57fa3f
fix: allow alternative items when using job card ( #26724 )
2021-08-09 10:46:29 +05:30
Ankush
16d4de5130
fix: price list with 0 value are ignored ( #26655 )
...
* fix: price list with 0 value are ignored
Steps to reproduce:
1. Create 2 item price for two different supplier. One of them should be
zero.
2. Create PO
3. Add supplier with non-zero price and add item.
4. change supplier. Price won't change. If price was non-zero it
would've changed.
Root cause: falsiness check instead of null value check is used for
checking if price list value exists. 0 is evaluated as false.
* refactor: make get_price_list_rate function pure
2021-08-09 10:41:24 +05:30
Noah Jacob
cb44aed78b
test: get sales order with variant
2021-08-06 11:16:25 +05:30
Noah Jacob
041ac339b1
style: improved formatting of sql query
2021-08-05 16:37:22 +05:30
Noah Jacob
b10465eebe
refactor: created function to get bom_item for query
2021-08-05 16:37:22 +05:30
noahjacob
9b0b2daf4a
refactor: updated sql query for item variants
2021-08-05 16:37:22 +05:30
noahjacob
cf4078756d
fix: fixed fetching sales order of item variant in production plan
2021-08-05 16:37:21 +05:30
Frappe PR Bot
1b9a5c851d
fix: incorrect amount in work order required items table. ( #26585 ) ( #26623 )
...
* fix: amount in work order not equal to rate * qty
* fix: patch for amount in work order required items
(cherry picked from commit cd12d95a24
)
Co-authored-by: Ankush <ankush@iwebnotes.com>
2021-08-03 20:06:36 +05:30
Rohit Waghchaure
343143037c
fix: conflicts
2021-08-01 14:45:24 +05:30
Frappe PR Bot
1b6dd84c0a
fix(bom): remove manual permission checking ( #26689 ) ( #26690 )
...
get_list does the permission checking.
(cherry picked from commit d95f16ac8f
)
Co-authored-by: Ankush <ankush@iwebnotes.com>
2021-07-28 18:11:11 +05:30
Ankush
8ed7a21cd5
fix(bom): remove manual permission checking ( #26689 )
...
get_list does the permission checking.
(cherry picked from commit d95f16ac8f
)
2021-07-28 11:12:27 +00:00
Ankush
d95f16ac8f
fix(bom): remove manual permission checking ( #26689 )
...
get_list does the permission checking.
2021-07-28 16:38:59 +05:30
Rohit Waghchaure
7903aeca7e
fix: not able to add employee in the job card
2021-07-27 22:19:41 +05:30
Rohit Waghchaure
940356d28a
fix: not able to add employee in the job card
2021-07-27 18:45:17 +05:30
Rohit Waghchaure
af58ac9e10
fix: not able to add employee in the job card
2021-07-27 18:43:20 +05:30
Ankush
cd12d95a24
fix: incorrect amount in work order required items table. ( #26585 )
...
* fix: amount in work order not equal to rate * qty
* fix: patch for amount in work order required items
2021-07-25 13:10:50 +05:30
Ankush
96caae1f56
fix: wrong operation time in Work Order ( #26613 ) ( #26617 )
...
* fix: wrong operation time in Work Order
Top level item time operation was not considering the BOM.quantity
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2021-07-25 13:01:21 +05:30
rohitwaghchaure
9ef157b23b
fix: wrong operation time in Work Order ( #26613 )
...
* fix: wrong operation time in Work Order
Top level item time operation was not considering the BOM.quantity
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-07-23 20:44:34 +05:30
rohitwaghchaure
ce3e877c40
fix: incorrect bom name (bp #26600 )
2021-07-22 16:10:58 +05:30
rohitwaghchaure
56c67743ab
fix: incorrect bom name ( #26600 )
2021-07-22 16:10:06 +05:30
Ankush
5b32fa5ccd
fix: SQL error on fetching RM in production plan (bp #26592 )
...
* fix: SQL error on fetching RM in production plan
* refactor: avoid passing by reference and mutations
2021-07-22 14:00:01 +05:30
Ankush
4ee6571784
fix: SQL error on fetching RM in production plan ( #26592 )
...
* fix: SQL error on fetching RM in production plan
* refactor: avoid passing by reference and mutations
2021-07-22 13:13:46 +05:30
Rohit Waghchaure
c14aa45720
fix: incorrect valuation rate calculation in gross profit report
2021-07-20 18:19:15 +05:30
Nabin Hait
11475487fb
fix: merge conflict
2021-07-16 15:58:50 +05:30
Rohit Waghchaure
df5c2b9aaf
fix: FG item not fetched in manufacture entry
2021-07-16 11:35:14 +05:30
Rohit Waghchaure
a748dd9261
feat: provision to make subcontracted purchase order from the production plan
2021-07-15 19:01:36 +05:30
Noah Jacob
26a9d38547
fix: WIP needs to be set before submit on skip_transfer ( #26500 )
2021-07-15 16:50:41 +05:30
Noah Jacob
d319e10883
fix: set default operation time to 0 ( #26511 )
2021-07-15 16:49:55 +05:30
Noah Jacob
6442b5df11
fix: set default operation time to 0 ( #26510 )
2021-07-15 16:47:50 +05:30
Noah Jacob
2f775ee53c
fix: WIP needs to be set before submit on skip_transfer ( #26507 )
2021-07-15 16:29:28 +05:30
Rohit Waghchaure
9997cce1ea
fix: FG item not fetched in manufacture entry
2021-07-15 15:32:21 +05:30
rohitwaghchaure
4d444559ff
Merge pull request #26508 from rohitwaghchaure/fixed-fg-items-not-added-for-batch-item
...
fix: FG item not fetched in manufacture entry
2021-07-15 15:32:05 +05:30
Noah Jacob
eeecb25a02
fix: WIP needs to be set before submit on skip_transfer ( #26499 )
2021-07-15 15:31:42 +05:30
Rohit Waghchaure
74b97b5ec9
fix: FG item not fetched in manufacture entry
2021-07-15 14:52:21 +05:30
Rohit Waghchaure
4acbeecbbe
fix: multi-currency issue
2021-07-13 15:35:30 +05:30
Rohit Waghchaure
0d190bb930
fix: multi-currency issue
2021-07-13 15:32:39 +05:30
rohitwaghchaure
f130f8385e
Merge pull request #26332 from rohitwaghchaure/fixed-bom-stock-report-not-working
...
fix: bom stock report not working
2021-07-07 00:22:03 +05:30
Rohit Waghchaure
5638fbb1aa
fix: bom stock report not working
2021-07-05 13:54:05 +05:30
Ankush Menat
03f7bf6589
test: variant BOM from template BOM
2021-07-05 12:26:14 +05:30
Richard Case
046e83bf50
fix: incorrect bom no. added for non-variant items on variant boms ( #26320 )
2021-07-05 12:26:14 +05:30
Richard Case
75fdf79376
fix: incorrect bom no. added for non-variant items on variant boms ( #26320 )
2021-07-05 10:56:34 +05:30
Rohit Waghchaure
3105332e3c
fix: allow to make job card without employee
2021-07-03 17:25:08 +05:30
Nabin Hait
fa006402b8
fix: merge conflict
2021-07-01 12:47:28 +05:30
Rohit Waghchaure
f99f872946
fix: update cost not working in the draft bom
2021-07-01 12:02:37 +05:30
rohitwaghchaure
c14fc9530c
Merge pull request #26279 from rohitwaghchaure/fixed-update-cost-not-working-for-draft-bom
...
fix: update cost not working in the draft BOM
2021-07-01 11:57:32 +05:30
Rohit Waghchaure
0bfd56e615
fix: update cost not working in the draft bom
2021-07-01 11:50:48 +05:30
Rohit Waghchaure
815e6ec846
fix: minor removed unused file
2021-06-30 11:35:50 +05:30
rohitwaghchaure
2a1d1e1cb1
Merge pull request #26240 from rohitwaghchaure/production-plan-sub-assembly-enhancement
...
feat: provision to make subcontracted purchase order from the production plan
2021-06-30 11:15:11 +05:30
Rohit Waghchaure
61690775a8
feat: provision to make subcontracted purchase order from the production plan
2021-06-29 19:59:20 +05:30
Rohit Waghchaure
2d1c4fee1d
fix: allow to changes to date in the blanket order
2021-06-29 00:33:55 +05:30
rohitwaghchaure
3c97839826
Merge pull request #26130 from rohitwaghchaure/develop-production-plan-fix-to-show-parent-warehouse
...
fix: allow to select group warehouse while downloading materials from…
2021-06-28 17:18:55 +05:30
Rohit Waghchaure
478360397d
fix: fetch batch items in stock reco
2021-06-26 22:31:03 +05:30
Rohit Waghchaure
e5c47f8957
fix: fetch batch items in stock reco
2021-06-26 17:40:27 +05:30
Ankush Menat
6588a936d5
fix: order and time of operations for multilevel bom
...
- Order of operations was being sorted by idx of individual operations in
BOM table, which made the ordering useless.
- This adds ordering that's sorted from lowest level item to top level
item.
- chore: remove dead functionality. There's no `items` table. Required
item level operations get overwritten on fetching of items /
operations e.g. when clicking on multi-level BOM checkbox.
- test: add test for tree representation
- feat: BOMTree class to get complete representation of a tree
2021-06-25 20:16:11 +05:30
Ankush Menat
9af3f12411
fix(ux): show bom in operations child table
2021-06-25 20:16:11 +05:30
Ankush Menat
b4e7ee0e45
chore: remove dead and py2 compatibility code
...
form_grid_template doesn't exist
2021-06-25 20:16:11 +05:30
Ankush Menat
805ac4ffdf
fix: order and time of operations for multilevel bom
...
- Order of operations was being sorted by idx of individual operations in
BOM table, which made the ordering useless.
- This adds ordering that's sorted from lowest level item to top level
item.
- chore: remove dead functionality. There's no `items` table. Required
item level operations get overwritten on fetching of items /
operations e.g. when clicking on multi-level BOM checkbox.
- test: add test for tree representation
- feat: BOMTree class to get complete representation of a tree
2021-06-25 16:44:57 +05:30
Ankush Menat
305bbc7619
fix(ux): show bom in operations child table
...
# Conflicts:
# erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json
2021-06-25 16:44:57 +05:30
Ankush Menat
923832c316
chore: remove dead and py2 compatibility code
...
form_grid_template doesn't exist
2021-06-25 16:44:57 +05:30
Ankush Menat
9e43445f36
fix: order and time of operations for multilevel bom
...
- Order of operations was being sorted by idx of individual operations in
BOM table, which made the ordering useless.
- This adds ordering that's sorted from lowest level item to top level
item.
- chore: remove dead functionality. There's no `items` table. Required
item level operations get overwritten on fetching of items /
operations e.g. when clicking on multi-level BOM checkbox.
- test: add test for tree representation
- feat: BOMTree class to get complete representation of a tree
2021-06-25 14:44:55 +05:30
Ankush Menat
6ec8875434
fix(ux): show bom in operations child table
2021-06-25 14:44:53 +05:30
Ankush Menat
ff4aadc657
chore: remove dead and py2 compatibility code
...
form_grid_template doesn't exist
2021-06-25 14:43:49 +05:30
Noah Jacob
0ceec76d98
refactor: update cost updates operation time and hour rates in BOM (fp #25891 )
...
* refactor: updates hour_rate and operation time on update cost
* refactor: hour_rates are updated in routing when updated in workstations
* test: test cases for updating hour_rates and operation time in linked bom
2021-06-24 20:27:47 +05:30
Rohit Waghchaure
2330c41cca
fix: total time calculation
2021-06-24 18:14:19 +05:30
Rohit Waghchaure
57307443f0
is corrective job card
2021-06-24 18:14:19 +05:30
Rohit Waghchaure
c878389050
fix: or condition filter in the get_all
2021-06-24 18:14:18 +05:30
Rohit Waghchaure
fcab53b238
fix: skip job card
2021-06-24 18:07:31 +05:30
Rohit Waghchaure
6e81489095
feat: Job Card Enhancements
2021-06-24 18:07:30 +05:30
Noah Jacob
da82bd4b51
refactor: update cost updates operation time and hour rates in BOM ( #25891 )
...
* refactor: updates hour_rate and operation time on update cost
* refactor: hour_rates are updated in routing when updated in workstations
* test: test cases for updating hour_rates and operation time in linked bom
2021-06-24 17:23:21 +05:30
Ankush
98e98d25e6
fix(Work Order): added freeze when trying to stop work order ( #26192 ) ( #26196 )
...
* fix: added freeze when trying to stop work order
* fix(ux): add freeze message
Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
2021-06-24 14:24:28 +05:30
Noah Jacob
b2b7369874
fix(Work Order): added freeze when trying to stop work order ( #26192 )
...
* fix: added freeze when trying to stop work order
* fix(ux): add freeze message
2021-06-24 14:21:35 +05:30
rohitwaghchaure
6a07869e55
Update production_plan.js
2021-06-21 15:41:30 +05:30
Rohit Waghchaure
00c05108b2
fix: allow to select group warehouse while downloading materials from production plan
2021-06-21 15:39:49 +05:30
rohitwaghchaure
8347eb1dba
Update production_plan.js
2021-06-21 15:38:44 +05:30
Rohit Waghchaure
773aabae44
fix: allow to select group warehouse while downloading materials from production plan
2021-06-21 14:54:27 +05:30
Rohit Waghchaure
7b7ceaadd9
feat: subcontract code refactor and enhancement
2021-06-20 15:27:01 +05:30
Rohit Waghchaure
a94b89727c
feat: subcontract code refactor and enhancement
2021-06-19 23:16:22 +05:30
Nabin Hait
0950481253
fix: merge conflict
2021-06-15 20:18:06 +05:30
Ankush Menat
9891780f5a
perf(minor): remove unnecessary comprehensions (port #25645 )
2021-06-11 18:40:22 +05:30
Ankush Menat
a9c84f749a
perf(minor): remove unnecessary comprehensions ( #25645 )
2021-06-11 16:00:48 +05:30
Rohit Waghchaure
9cfd3adad9
fix: custom conversion factor field not mapped from job card to stock entry
2021-06-11 10:56:44 +05:30
Rohit Waghchaure
af4794b2d1
fix: custom conversion factor field not mapped from job card to stock entry
2021-06-04 10:53:44 +05:30
rohitwaghchaure
40b90e5b6e
Merge pull request #25478 from noahjacob/prod_plan_feat
...
feat: Added check box to combine items with same BOM
2021-06-03 12:37:02 +05:30
Nabin Hait
a3d1b6973a
fix: merge conflict
2021-05-31 11:21:33 +05:30
Ankush Menat
431d3295b4
fix: use dictionary filter instead of list ( #25874 )
...
Item query doesn't support list filter anymore.
2021-05-28 21:12:25 +05:30
Ankush Menat
2df7f474fa
fix: use dictionary filter instead of list ( #25875 )
...
Item query doesn't support list filter anymore.
2021-05-28 21:12:10 +05:30
noahjacob
73e41c0bd6
refactor: suggested changes
2021-05-25 18:01:47 +05:30
noahjacob
bf1b3b89d1
refactor: updated conditional visibility of check box
2021-05-24 17:03:15 +05:30
Suraj Shetty
81d49e9c71
fix: Use extend_cscript function to properly extend class methods to cscript
2021-05-21 17:03:09 +05:30
noahjacob
516c789127
refactor: variable names and suggested changes
2021-05-19 16:01:39 +05:30
Suraj Shetty
a83d2aacd9
Merge branch 'develop' into esbuild
2021-05-18 14:48:28 +05:30
noahjacob
50f52dfbcb
refactor: variable names and refactored cancel function into submit function
2021-05-09 20:04:06 +05:30
Ankush Menat
90e671905a
chore: replace assertEquals with alias assertEqual ( #25613 )
...
* chore: replace assertEquals with alias assertEqual
assertEquals has been deprecated.
ref: https://docs.python.org/3/library/unittest.html#deprecated-aliases
* chore: sider fixes
2021-05-07 20:28:51 +05:30
Faris Ansari
69eb6d476e
Merge remote-tracking branch 'upstream/develop' into esbuild
2021-05-07 15:21:33 +05:30
Noah Jacob
4ecae62194
fix: added is_stock_item filter ( #25530 )
2021-05-06 19:42:01 +05:30
noahjacob
90c667205a
test: added on_cancel test
2021-04-29 13:06:04 +05:30
noahjacob
93c22ebbb9
refactor: created separate function to update work_order on cancel
2021-04-29 12:57:41 +05:30
noahjacob
56f697052c
test: added test case for combining items
2021-04-28 20:12:33 +05:30
noahjacob
b7ca913904
fix: Added Item Reference field to link tables and update work_order_qty
2021-04-28 19:27:20 +05:30
noahjacob
82905166d9
fix: Fixed updating sales order work qty after cancelling work order
2021-04-28 10:14:36 +05:30
noahjacob
1e912db3bb
feat: Added check box to combine items
2021-04-26 16:01:17 +05:30
Faris Ansari
1fe891b287
refactor: Replace Class.extend with native class
2021-04-23 08:04:00 +05:30
Ankush Menat
7eac4a250d
fix: functions using mutable defaults ( #25370 )
2021-04-19 10:33:39 +05:30
Ankush Menat
ad6a2657ae
chore: minor translation fixes
2021-04-17 16:56:09 +05:30
Ankush Menat
dedf2c1b61
fix: remove duplicate keys from dictionaries
2021-04-17 16:56:08 +05:30
Nabin Hait
10c61376e3
fix: Backport missing commits to develop branch ( #25305 )
2021-04-13 15:46:01 +05:30
Rushabh Mehta
65f25c27b3
fix(minor): fix dynamically changing grid properties
2021-04-13 11:58:16 +05:30
Ankush Menat
c65751d97f
test: ignore floating point errors in test_bom
2021-04-12 19:45:34 +05:30
rohitwaghchaure
f9fde054e1
Merge pull request #25242 from rohitwaghchaure/fixed-test-case-for-bom-cost
...
fix: bom cost test case
2021-04-08 14:39:08 +05:30
Rohit Waghchaure
fa8bb87a86
fix: bom cost test case
2021-04-08 13:38:22 +05:30
Ankush Menat
cb625d868c
fix: round total quantity in job card
2021-04-08 12:05:52 +05:30
Sagar Vora
993cf8c2cd
test: cleanup BOM in test_routing
and prevent overlap in test_job_card
( #25180 )
2021-04-03 20:25:19 +05:30
Sagar Vora
cce3efe0c1
test: specify warehouse list to avoid error ( #25174 )
...
* test: specify warehouse list to avoid error
* test: get_all_warehouses of BOM company
2021-04-03 19:46:44 +05:30
Ankush Menat
777745f1e0
fix: do not fetch stopped MR in production plan
...
- Ignore stopped MR while using fetch button
- Add filter on field inside child table.
Related issue: ISS-20-21-10757
2021-03-31 19:53:19 +05:30
Walstan Baptista
d6360755b9
chore: frappe.whitelist for doc methods ( #25068 )
...
* chore: frappe.whitelist for doc methods
* fix: incorrect spelling
* fix: sider issue
Co-authored-by: Sagar Vora <sagar@resilient.tech>
2021-03-31 12:30:32 +05:30
Walstan Baptista
d65458d534
test: corrected item name ( #25075 )
2021-03-31 12:14:41 +05:30
Rucha Mahabal
87a70fe8cb
feat: Show Required Qty as per BOM in Material Request Items
2021-03-26 18:37:50 +05:30
Rucha Mahabal
9dbabb92df
feat: Add more fields to raw material download
2021-03-26 18:37:40 +05:30
Rucha Mahabal
07409990a0
fix: Ordered and Reserved Qty for Production not getting fetched in Items
2021-03-26 18:37:24 +05:30
Rucha Mahabal
1f86471656
feat: show ordered and reserved qty in Material Request Plan Item table
2021-03-26 18:36:52 +05:30
Rucha Mahabal
66bae19c16
feat(Production Plan): Consider Safety Stock in Required Qty Calculation
2021-03-26 18:36:33 +05:30
Sagar Vora
0b569b3e43
fix: allow creating stock entry based on work order for customer provided items ( #24885 )
2021-03-26 14:40:15 +05:30
Deepesh Garg
82983369fa
fix: Period list for exponential smoothing forecasting report ( #24982 )
2021-03-23 21:11:01 +05:30
Marica
e6ad39038e
chore: Allow changing Work Stations in WO. ( #24897 )
2021-03-23 10:46:03 +05:30
Rohit Waghchaure
4c089b5852
minor fixes
2021-03-07 12:17:59 +05:30
Afshan
ae63d66b8f
fix: column names
2021-02-23 13:38:52 +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
Anuja Pawar
0b04e23f6d
fix: BOM Stock Report UoM correction ( #24339 )
2021-01-13 21:04:03 +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
Rushabh Mehta
ab1c2b7631
fix(minor): routing
2020-12-23 23:26:58 +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
Shivam Mishra
fd044b032f
Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into desk-enhancements
2020-12-16 13:21:10 +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
Mohammad Hasnain
59dffb96b3
fix(Production Planning): incorrect required qty
2020-12-08 11:13:00 +05:30
Shivam Mishra
2fa3cac814
feat: update workspace folders
2020-12-03 15:48:57 +05:30
Shivam Mishra
2895645f86
feat: rename desk page to workspace
2020-12-03 15:39:53 +05:30
Shivam Mishra
9aaca25edb
feat: update desk page json
2020-12-01 13:39:54 +05:30
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