nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-25 21:05:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,709 Commits 607 Branches 1,804 Tags
5bdb6041b95fb1cc5574fc79ab9161f02cd255be
Commit Graph

1330 Commits

Author SHA1 Message Date
mergify[bot]
a831e6b552 fix: bom item query (backport #27890) (#27894) 
* fix: bom item query #27890

fix: bom item query
(cherry picked from commit 0a3dd3e954)

# Conflicts:
#	erpnext/manufacturing/doctype/bom/test_bom.py

* fix: resolve conflict

* chore: unused imports

[skip ci]

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-10-11 12:45:24 +05:30
mergify[bot]
e4f12f0458 fix: update variant qty in BOM, Create Work Order dialog (#27686) (#27732) 
(cherry picked from commit ece446ffe5)

Co-authored-by: Alan <2.alan.tom@gmail.com>
 2021-10-01 23:21:08 +05:30
Frappe PR Bot
1acdadea00 fix(ux): added exception of template item in filters (#27560) (#27675) 
(cherry picked from commit 5c249decbb)

Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
 2021-09-27 23:01:14 +05:30
Bhavesh Maheshwari
9ebabb86b3 fix: remove unknown field employee_name from query (#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>
 2021-09-21 20:30:53 +05:30
Frappe PR Bot
47c6fba317 fix: (ux) Use subassembly schedule date while making WO from Prod Plan (bp #27628) 
- Set subassemply WO's planned start date from Production Plan

(cherry picked from commit 9110223341)

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2021-09-21 17:12:45 +05:30
Frappe PR Bot
e9683fad47 fix(ProdPlan): Get SubAssy Items does not work (bp #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

(cherry picked from commit 78fe92542c)

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-16 10:22:43 +00:00
Frappe PR Bot
a87cc12024 feat: provision to add scrap item in job card (#27483) (#27512) 
(cherry picked from commit c5a77f60ed)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2021-09-15 17:17:59 +05:30
Frappe PR Bot
e4cbe12a71 fix: calculate operating cost based on BOM Quantity (#27464) (#27501) 
* fix: calculate operating cost based on BOM Quantity

* fix: added test cases

(cherry picked from commit 2e2985e4f1)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2021-09-15 01:18:56 +05:30
Ankush Menat
4081ecfcd7 chore: sort imports 2021-09-14 18:35:17 +05:30
Marica
d76e5dcb93 Merge pull request #27486 from marination/job-card-excess-transfer-hotfix 
fix: Handle Excess/Multiple Item Transfer against Job Card
 2021-09-14 17:57:39 +05:30
Frappe PR Bot
5126b3f93e fix: job card overlap unknown column jc.employee (#27403) (#27405) 
* fix: incorrect query for job card overlap

* test: employee overlap in job cards

* test: simplify/refactor job card tests

(cherry picked from commit 678335f8ac)

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-09 12:45:25 +05:30
Frappe PR Bot
81dbf1ed00 fix: added delivery date filters to get sales orders in production plan (#27367) (#27397) 
(cherry picked from commit 295020451f)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2021-09-09 12:20:49 +05:30
Frappe PR Bot
2d3c036070 fix: auto complete sales order rows in production plan (#27352) (#27396) 
* fix: auto complete sales order rows in production plan

* fix: sider

(cherry picked from commit 81d3524d27)

Co-authored-by: Alan <2.alan.tom@gmail.com>
 2021-09-08 16:52:43 +05:30
Chillar Anand
4b2be2999f chore: Cleanup imports (#27320) 
* chore: Added isort to pre-commit config

* chore: Sort imports with isort

* chore: Remove imports with pycln

* chore: Sort imports with isort

* chore: Fix import issues

* chore: Fix sider issues

* chore: linting

* chore: linting / sorting import

from ecommerce refactor merge

* ci: dont allow unused imports

* chore: sort / clean ecommerce imports

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-03 18:57:43 +05:30
Ankush Menat
9d0b5f1a0d Merge pull request #27299 from ankush/strict_linting_v13 
chore: cleanup linting errors and introduce strict linting checks
 2021-09-01 21:16:47 +05:30
Ankush Menat
8746466412 chore: correct indentation 2021-09-01 20:16:24 +05:30
rohitwaghchaure
71e1615925 fix: production plan UX and validation message (#27278) 
(cherry picked from commit 2a8cd05b44)
 2021-09-01 13:49:52 +00:00
Frappe PR Bot
85fe755f89 fix: operation time auto set to zero (#27189) 
* fix: operation time auto set to zero (#27188)

(cherry picked from commit e6799d78ef)

# Conflicts:
#	erpnext/patches.txt

* Update patches.txt

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2021-08-27 11:02:37 +05:30
Richard Case
69d88a9212 fix: Production Plan: load document defaults for plan items & remove name column from listview (#26584) 2021-08-26 21:52:16 +05:30
Frappe PR Bot
8dae084f23 chore: remove deprecated and empty QUnit tests (#27179) (#27181) 
* 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.

(cherry picked from commit ae55eab599)

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-08-26 21:08:08 +05:30
Frappe PR Bot
c5c78641e1 fix: don't allow BOM's item code at any level of child items (#27157) (#27176) 
* 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

(cherry picked from commit c07dce940e)

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-08-26 19:05:13 +05:30
18alantom
f7f573b11b fix: prevent over riding scrap table values, name kwargs, set currency 2021-08-26 13:19:10 +05:30
18alantom
466ff46045 Merge branch 'version-13-hotfix' into feat-bom-process-loss 2021-08-26 13:16:43 +05:30
Frappe PR Bot
0fe6995816 fix: sequence of sub-operations in job card (#27138) (#27147) 
(cherry picked from commit ad45ddcabe)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2021-08-25 20:11:23 +05:30
18alantom
38898d33c6 fix: update scrap table item details; typo 2021-08-24 20:39:51 +05:30
18alantom
8c4d80a58a Merge branch 'feat-bom-process-loss' of https://github.com/18alantom/erpnext into feat-bom-process-loss 2021-08-24 20:19:35 +05:30
18alantom
9e96861f15 fix: correct value in test 2021-08-24 20:19:20 +05:30
Alan
b58496dda4 Merge branch 'version-13-hotfix' into feat-bom-process-loss 2021-08-24 20:12:01 +05:30
18alantom
795efcd017 feat: process loss report, fix set pl query condition 2021-08-24 18:39:02 +05:30
18alantom
a14b93d0d8 feat: add procss_loss_qty field in work order 2021-08-24 16:11:48 +05:30
Frappe PR Bot
3f05d928a3 refactor: rectify typo (#27057) (#27059) 
[skip ci]

(cherry picked from commit 62c590261c)

Co-authored-by: Alan <2.alan.tom@gmail.com>
 2021-08-20 18:24:49 +05:30
Frappe PR Bot
52570cc1f9 refactor: renamed varint_item_code to variant_item_code (#27025) (#27046) 
(cherry picked from commit f13315809e)

Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
 2021-08-19 20:55:45 +05:30
Frappe PR Bot
5c6f6c16d6 fix: pass planned start date to created work order (#27031) (#27042) 
* fix: pass planned start date to created workorder

* test: production plan to work order start date

Co-authored-by: Alan <2.alan.tom@gmail.com>
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
(cherry picked from commit 9225f02599)
 2021-08-19 18:56:26 +05:30
Frappe PR Bot
74af3be968 fix: set production plan to completed even on over production (#27027) (#27032) 
(cherry picked from commit 09f34e558e)

Co-authored-by: Alan <2.alan.tom@gmail.com>

[skip ci]
 2021-08-19 10:50:06 +00:00
Ankush Menat
9bb69e711a chore: whitespace cleanup from codebase 2021-08-19 14:33:03 +05:30
18alantom
f8a47525e1 fix: reword error messages, fix test values 2021-08-17 16:47:45 +05:30
18alantom
1c23544c42 fix: wo tests, sider, account for pl in se validation 2021-08-17 15:54:27 +05:30
18alantom
0992b2eeef test: check manufacture completion qty in se and wo 2021-08-10 12:23:19 +05:30
18alantom
ce44e11caf refactor: validation error message formatting 2021-08-09 17:37:17 +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
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
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
Rohit Waghchaure
af58ac9e10 fix: not able to add employee in the job card 2021-07-27 18:43:20 +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