Commit Graph

29877 Commits

Author SHA1 Message Date
Ankush Menat
a36c249d3d test: item-wh repost creation 2021-11-25 16:37:19 +05:30
Ankush Menat
6dc9b822bc refactor: item-wh wise reposting by default 2021-11-25 16:37:19 +05:30
Deepesh Garg
5ba3b28d69 fix(refactor): Advance tds allocation to purchase invoice 2021-11-25 15:42:30 +05:30
Marica
ffdf32b5b3
Merge branch 'develop' into cost-of-poor-quality 2021-11-25 13:29:40 +05:30
marination
42395af22a fix: Remove commented code 2021-11-25 13:28:52 +05:30
GangaManoj
c9743185c6 fix: Remove unnecessary comma 2021-11-24 21:58:42 +05:30
GangaManoj
adfd519139 fix: Test Product Bundle price calculation when there are multiple Product Bundles 2021-11-24 21:58:05 +05:30
GangaManoj
325923afc7 fix: Test that indices are reset for Packed/Bundle Items when Product Bundles are removed from the Items table 2021-11-24 21:47:06 +05:30
GangaManoj
8370042f82 fix: Reset indices in the Packed/Bundle Items table on deleting Product Bundles 2021-11-24 21:06:23 +05:30
Mohammed Yusuf Shaikh
8d2abc4b86
fix: fixes in work order doctype (#28217)
* fix: fixes in work order doctype

* fix: sider issues and disabled set only once property

* fix: set default qty to manufacture

* fix: dont manually collapse sections

* fix: remove unnecessary messages

* fix: make dependent fields read only

Co-authored-by: Ankush Menat <ankush@frappe.io>
2021-11-24 16:23:12 +05:30
Saqib
136dd4f801
Merge branch 'develop' into product-bundle-fixes 2021-11-24 11:27:12 +05:30
Deepesh Garg
6ca5f228f8 Merge branch 'develop' of https://github.com/frappe/erpnext into advance_tds_allocation_gl 2021-11-24 10:45:02 +05:30
GangaManoj
0803f87660 fix: Fix Product Bundle price calculation when there are multiple Product Bundles 2021-11-24 06:07:58 +05:30
Ganga Manoj
068177d293
Merge branch 'develop' into serialized-item-consumption 2021-11-24 05:29:56 +05:30
Ankush Menat
ab2c1f62a1
fix: correct module for reloading doc (#28523) 2021-11-23 18:21:00 +05:30
mergify[bot]
34d1fec7de
fix: broken bom tree view and remove duplicate button (#28512) (#28527)
* fix: broken bom tree view and remove duplicate button

(cherry picked from commit 7ae1369d64ecaa829965d89915475fbd3211b5c2)

Co-authored-by: Bhavesh Maheshwari <34086262+bhavesh95863@users.noreply.github.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
2021-11-23 17:53:26 +05:30
Ankush Menat
0df9cf9526
chore: remove dead/irrelevant links from workspace (#28519)
* chore: remove dead link to shopify settings

* chore: unlink "debug" reports from stock dashboard
2021-11-23 15:08:51 +05:30
Ganga Manoj
5ef2330022
fix: Replace 'parent' with 'invoice_or_item' (#28513) 2021-11-23 12:28:41 +05:30
Subin Tom
1909bb569e
fix: POS Item cart only taxes with amount displayed (#28501) 2021-11-23 10:35:43 +05:30
Rucha Mahabal
5ba1bc1572
fix: Employee link formatter showing incorrect value for Employee Name (#28504) 2021-11-23 09:30:30 +05:30
GangaManoj
406278b5c1 fix: Add bundle items to PO only if the Product Bundle was selected from the SO 2021-11-23 04:51:53 +05:30
Rucha Mahabal
e7eef9601d
fix(UX): Allocated Amount in Advances not updated on updating expense amount in Expense Claim (#28497)
* fix(UX): Allocated Amount in Advances not updated on updating expense amount in Expense Claim

* fix: Expense Claim Advance form labels
2021-11-22 20:13:15 +05:30
Deepesh Garg
056e3b199c
Merge pull request #28469 from nemesis189/new-company-setup-fy-query
fix: FY query returning None for new company
2021-11-22 19:23:07 +05:30
Rohit Waghchaure
db9bd5b912 feat: report to see the consumed materials against the work order 2021-11-22 18:01:20 +05:30
Deepesh Garg
e8370147e8
Merge pull request #28489 from deepeshgarg007/ksa_print_format
fix: KSA Invoice print format for multicurrency invoices
2021-11-22 16:34:34 +05:30
Deepesh Garg
73c56510d8 fix: Delete KSA vat setting on deleting company 2021-11-22 14:21:53 +05:30
Subin Tom
fce4f34325
fix: POS string translation (#28381) 2021-11-22 13:34:26 +05:30
Deepesh Garg
42c40b33bc fix: KSA Invoice print format for multicurrency invoices 2021-11-22 13:20:43 +05:30
Sagar Sharma
aa689874e3
fix: Closed status error in Work Order Summary (#28460)
* fix: Closed status error in Work Order Summary

* chore: use get_meta to get status options

* refactor: simplify code

Co-authored-by: Ankush Menat <ankush@frappe.io>
2021-11-22 13:06:59 +05:30
Anupam Kumar
b8ef8bcde9
Merge branch 'develop' into manufacturing-work-order-closed 2021-11-22 12:56:15 +05:30
Ankush Menat
c436e30ee6 fix: don't use cached doc while reposting 2021-11-22 12:40:18 +05:30
Ankush Menat
aa024fc9da fix: ignore permissions while creating repost
If user reached this code then they already have permission to create
stock transaction, hence ignore permission checks while
creating/cancelling repost item valuation entries.
2021-11-22 12:40:18 +05:30
Ankush Menat
42f1dd98dd fix: restrict repost valuation to manager roles 2021-11-22 12:40:18 +05:30
Ganga Manoj
7d0558e202
fix: Add extra column to display Invoice or Item when grouped by Invoice (#28380) 2021-11-22 12:34:46 +05:30
Saqib
cb52e6dd6b
fix: cost center wise ledger posting for pcv (#28477) 2021-11-22 12:24:32 +05:30
Saqib
78851ecb70
feat: create party link from customer/supplier (#28387)
* feat: create party link from customer/supplier

* test: create_party_link method
2021-11-22 12:23:23 +05:30
Saqib
7677d6d4c3
Merge pull request #28402 from GangaManoj/gross-profit-percentage
fix: Gross Profit report totals
2021-11-22 12:21:22 +05:30
Ahmed Shareef
3a2074ce05
fix: add child button in coa tree (#28413) 2021-11-22 11:46:58 +05:30
Ganga Manoj
624e58d1de
fix: Filter out cancelled and non-depreciable Assets in Asset Value Adjustment (#28443) 2021-11-22 11:36:35 +05:30
Deepesh Garg
8701f537bb
Merge pull request #28471 from nextchamp-saqib/fix-qrcode-generation-ksa
fix: bug with qrcode generation due to default print format name
2021-11-22 10:37:27 +05:30
Anupam Kumar
44303f93cc
Merge branch 'develop' into manufacturing-work-order-closed 2021-11-22 10:36:02 +05:30
Saqib
6e3a276a75
Merge branch 'develop' into new-company-setup-fy-query 2021-11-20 15:16:26 +05:30
Saqib
08ad93d82f
fix: coa balance rendering bug (#28468) 2021-11-20 15:15:46 +05:30
Saqib Ansari
ac27391a1f fix: bug with qrcode generation due to default print format name 2021-11-20 11:22:19 +05:30
Subin Tom
350ed1a6c2 fix: FY query returning None for new company 2021-11-19 21:05:25 +05:30
Mohammed Redah
9d319c2205
fix:Change QR Code Triggerr event
This fixes the bug if the user changes the date after insertion it will show the wrong values
2021-11-19 15:13:23 +03:00
Deepesh Garg
ff65399ae9 fix: Add test for gst category check
(cherry picked from commit cdbc991e3f97c7ed3e120b2e4720298402d1de77)
2021-11-19 06:51:58 +00:00
Deepesh Garg
a38aca5a54 fix(India): GST category not getting auto updated
(cherry picked from commit f8a26a9fac2c91b036f1dd4033f3fb4797285043)
2021-11-19 06:51:58 +00:00
Deepesh Garg
a57d39909e
Merge pull request #28302 from nemesis189/shipping-rule-updation-error
fix: Shipping Rule picking up old net_rate
2021-11-19 08:21:53 +05:30
Ankush Menat
f8e371af14 fix(ux): ordering fields for better tab order 2021-11-18 15:48:15 +05:30
Sagar Sharma
488d34af1f
fix: unchecking the "With Operations" in BOM clears operations table #28446 2021-11-18 13:57:13 +05:30
Ganga Manoj
5d8a85db10
Merge branch 'develop' into gross-profit-percentage 2021-11-17 19:23:34 +05:30
Marica
d0c240ee84
Merge pull request #28431 from marination/capacity-dashboard-style
fix: (style) Warehouse Capacity Dashboard UI
2021-11-17 18:04:26 +05:30
Ankush Menat
8102e4a210
chore: remove manual collapsing of section (#28435) 2021-11-17 17:05:07 +05:30
Ankush Menat
402205278c chore: remove support email from error message.
[skip ci]
2021-11-17 16:33:18 +05:30
marination
23486a929d fix: (style) Warehouse Capacity Dashboard UI
- Made refresh button icon visible
- Edit Capacity button size and alignment
- Medium font on dashboard
2021-11-17 14:21:37 +05:30
rohitwaghchaure
b9c8489de6
Merge pull request #28417 from rohitwaghchaure/currency-wise-pricing-rule-not-working
fix: currency wise pricing rule not working
2021-11-17 14:02:19 +05:30
Rohit Waghchaure
43aeb541c2 fix: currency wise pricing rule not working 2021-11-17 13:30:17 +05:30
rohitwaghchaure
69421a30d7
Merge pull request #28425 from rohitwaghchaure/improve-performance-to-submit-jv-and-invoice
fix: performance issue while submitting the Journal Entry
2021-11-17 12:54:59 +05:30
Rohit Waghchaure
7472760ea3 fix: performance to submit the JV 2021-11-17 11:16:52 +05:30
Anupam Kumar
98308ea089
Merge branch 'develop' into manufacturing-work-order-closed 2021-11-17 10:07:35 +05:30
Subin Tom
e7b4204c35 fix: sider issues 2021-11-16 20:39:58 +05:30
Sagar Vora
c00d0a3e24
fix: better validation for Integration Request (#28186) 2021-11-16 20:31:18 +05:30
Anupam Kumar
37aa2cb271
Merge branch 'develop' into manufacturing-work-order-closed 2021-11-16 19:35:20 +05:30
marination
c192c135d4 Merge branch 'develop' of https://github.com/frappe/erpnext into cost-of-poor-quality 2021-11-16 19:15:47 +05:30
Subin Tom
a8e2c02e14 fix: fixed tests, separated a method for shipping charges 2021-11-16 19:06:49 +05:30
Marica
612bb5c749
Merge branch 'develop' into se-required-items-from-jc 2021-11-16 18:03:40 +05:30
Marica
6bd0c1dbf1
Merge pull request #28269 from marination/pr-return-ux
refactor:  (ux) Accepted/Rejected/Received Qty UX
2021-11-16 18:00:42 +05:30
Subin Tom
a1807a2f98
fix: POS idx issue in taxes table while merging (#28389) 2021-11-16 17:46:26 +05:30
Saqib
5f30104e00
Merge branch 'develop' into gross-profit-percentage 2021-11-16 16:00:07 +05:30
Saqib
950261d860
Merge branch 'develop' into serialized-item-consumption 2021-11-16 15:59:53 +05:30
Marica
4afcbfdc08
Merge branch 'develop' into pr-return-ux 2021-11-16 15:15:48 +05:30
marination
a5f8274d79 fix: test_job_card_partial_material_transfer test
- Use a specific BOM for JC tests
- Utility to create said BOM
- Sider: unused variable
2021-11-16 15:13:19 +05:30
marination
293f6cbafd fix: Sider, Linter and Server Side Test
- Fix Server side PR test
- linter: re-arrange imports
- sider: avoid single line multi statement
- Code cleanup: Improve code readability and avoid horizontal scroll in test_purchase_receipt
- Removed unused variables in test_purchase_receipt
2021-11-16 14:36:15 +05:30
Ahmed Shareef
952fc87c99
refactor: fix help section background in dark mode (#28406) 2021-11-16 14:30:13 +05:30
marination
e9c75d6eea test: Purchase Invoice Received Qty 2021-11-16 11:55:34 +05:30
Rohit Waghchaure
d82910b08a fix: Pricing Rule not created against the Promotional Scheme 2021-11-16 10:27:59 +05:30
Ankush Menat
ed99aca36f test: basic test for serialize reco cancel 2021-11-16 10:00:18 +05:30
Ankush Menat
8c85012a70 fix: can not cancel stock reconciliation with sr no 2021-11-16 10:00:18 +05:30
GangaManoj
1affa12b74 fix: Replace 'Totals' with 'Total' 2021-11-16 03:36:47 +05:30
GangaManoj
508a2301ee fix: Display totals row in bold 2021-11-16 03:22:04 +05:30
GangaManoj
c7ffe3a7b4 fix: Remove unnecessary condition 2021-11-16 02:36:58 +05:30
GangaManoj
582a7ae964 fix: Add totals row when Grouped By Invoice 2021-11-16 02:33:51 +05:30
GangaManoj
3aaf7cb408 fix: Remove default Totals row 2021-11-16 02:33:12 +05:30
Deepesh Garg
74ccaeb07d
Merge branch 'develop' into shipping-rule-updation-error 2021-11-15 20:34:05 +05:30
Rohan
043e3255d6
fix: remove item-item group name validation (#28392) 2021-11-15 19:41:17 +05:30
Deepesh Garg
ce06aaa0ae
Merge pull request #27735 from GangaManoj/fix-so-cancellation-message
fix: Sales Order cancellation message
2021-11-15 18:51:30 +05:30
Ankush Menat
54184e54ed fix: patch for naming series property setter 2021-11-15 18:18:22 +05:30
Ankush Menat
7fcaeca403 fix: don't make naming series mandatory for items
Item variants are an exception, hence this needs to be checked
conditionally.
2021-11-15 18:18:22 +05:30
marination
05ec7cce82 test: Purchase Receipt Received Qty 2021-11-15 17:49:14 +05:30
marination
afe1c45f7f fix: Sider + Fields UX
- remove extra space (sider)
- PR: Bring rejected qty in grid view
- PI: Rename `Stock Qty` to `Accepted Qty in Stock UOM`
- PI: Move `Accepted Qty in Stock UOM` under Stock UOM
2021-11-15 17:17:29 +05:30
Sagar Sharma
2eccb7a1ca
fix: Work order creation from sales order (#28388)
* fix: Work order creation from sales order

* chore: formatting

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
2021-11-15 16:08:15 +05:30
marination
bb561ba7a8 fix: Server side test
- make `tests_that_skip_setup` a tuple (added comma)
- remove manual teardown in `test_job_card_material_transfer_correctness` to avoid premature committing
- transfer_material_against = "Job Card" while making BOM with mulitple operations
2021-11-15 15:21:20 +05:30
Deepesh Garg
ccbb8c82b3
Merge branch 'develop' into fix-hsn_wise 2021-11-14 10:37:36 +05:30
Smit Vora
520f33b02f fix(regional): hsn_wise as false returns item_code 2021-11-14 08:10:53 +05:30
Ankush Menat
c0f06bc8e3
fix: validate hmac unconditionally (#28372) 2021-11-12 14:45:51 +05:30
Sagar Vora
6d3e9bce5f
fix(M-Pesa): validate type before executing get_doc (#28369) 2021-11-12 14:24:33 +05:30
Sagar Vora
24b048925b
fix(WooCommerce): always expect signature in webhook requests (#28367) 2021-11-12 14:08:02 +05:30
Sagar Sharma
a424310581
fix: Collapse Scrap Items in Job Card (#28362) 2021-11-12 13:50:30 +05:30
Deepesh Garg
829f92f10a
Merge pull request #28363 from deepeshgarg007/default_party_account
fix: Default party account getting overriden in invoices
2021-11-12 13:04:21 +05:30
Deepesh Garg
88648570d7 fix: Default party account getting overriden in invoices 2021-11-12 12:39:30 +05:30
Sagar Sharma
944bf8da71
fix: Unable to edit supplier scorecard criteria name once created (#28348) 2021-11-11 19:49:41 +05:30
rohitwaghchaure
0157da57b5
Merge pull request #28308 from rohitwaghchaure/commision-rate-not-fetch-from-sales-person
fix: commission rate not fetch from sales person
2021-11-11 19:11:31 +05:30
GangaManoj
1393f97ad5 fix: Add serial no to Stock Entry doc to decrease quantity for Stock Items consumed during repair 2021-11-11 18:48:23 +05:30
GangaManoj
4668bb4be0 feat: Add 'Add Serial No' button in the Stock Items table 2021-11-11 18:42:25 +05:30
GangaManoj
abb535540a fix: Rename item to item_code 2021-11-11 18:41:16 +05:30
GangaManoj
1aed8c4b2f feat: Add Serial No field 2021-11-11 18:40:38 +05:30
Saqib
ecbe4b16b8
perf(minor): general ledger report (#27987) 2021-11-11 13:55:21 +05:30
Marica
18f9e3558e
Merge branch 'develop' into se-required-items-from-jc 2021-11-11 11:14:37 +05:30
Deepesh Garg
0dca97eb9f fix(India): Sales Invoice with duplicate items not showing correct taxable value 2021-11-10 21:07:48 +05:30
Ankush Menat
c96b5492db fix: reload doctype forcefully 2021-11-10 19:41:55 +05:30
Subin Tom
af1fce0419 fix: check if shipping rule value exists 2021-11-10 16:49:12 +05:30
Subin Tom
18ae03d967 fix: calling shipping rule method during net_total calculation in taxes_adn_totals.py 2021-11-10 15:57:41 +05:30
Anupam Kumar
3d012ad31d
Merge branch 'develop' into manufacturing-work-order-closed 2021-11-10 14:55:53 +05:30
Anupam
1a7851b1ad fix: error message 2021-11-10 14:55:13 +05:30
Saqib
6d05bb5274
fix(pos): get mode of payments query (#28321) 2021-11-10 13:06:55 +05:30
Ankush Menat
12e81df2b7 fix: default value for allow neg stock in repost_item_valuation
Negative stock can be toggled back after queuing transactions, this
causes failure when repost is executed.

Now allow_negative_stock stock is set at time of queuing the repost job.
This means setting changes done afterwards won't affect already
submitted reposts.
2021-11-10 13:05:14 +05:30
Anuja Pawar
2f004693c3
fix(Bank Reconciliation): get credit amount for bank account of type liability 2021-11-10 12:36:54 +05:30
Ankush Menat
e498389b00 fix: ignore cancelled entries in incorrect balance qty report 2021-11-10 12:09:51 +05:30
Anupam
68dc42fb1f fix: function name [is_work_order_stopped -> is_work_order_closed] 2021-11-10 10:12:29 +05:30
Rohit Waghchaure
4d4bfa2333 fix: commision rate not fetch from sales person 2021-11-10 00:00:38 +05:30
marination
1eb3ca2b86 fix: (travis) Production Plan Summary Report breaks if no WO
- `get_cached_value` throws a DoesNotExistError if non-existent value, used `get_value` instead
- accomodate production plan items that dont have WO/PO against them as well (blank values)
- added some None value handling to avoid AttributeError
2021-11-09 23:07:28 +05:30
Anupam Kumar
6954dd6329
feat: Competitor Tagging in Opportunity and Quotation (#28050)
* feat: Competitor Tagging in Opportunity and Quotation

* fix: review changes

* fix: linter issue

* fix: section label

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-11-09 19:36:27 +05:30
Ankush Menat
ccf84ae88a fix: patch to update job card status 2021-11-09 18:04:50 +05:30
Ankush Menat
fdfa39c231 fix: avoid mutating iterator while iterating over it 2021-11-09 18:04:50 +05:30
Ankush Menat
37799fe3dd fix: use completion qty instead of transfer quantity for JC status 2021-11-09 18:04:50 +05:30
Marica
031178224f
Merge branch 'develop' into se-required-items-from-jc 2021-11-09 17:33:20 +05:30
Wolfram Schmidt
6907ad8adb
fix: add Email option to contact email field (#28296)
* Update warranty_claim.json

Added the Email in option field of Contact Email so you are able to create a notification mapping to this field as reciever.

* Update warranty_claim.json
2021-11-09 17:32:57 +05:30
marination
e8d0c25dff fix: Partial Trabsfers against JC
- Fixed transferred qty not back updating on JC if partial transfer
- Partial transfer not mapping pending qty from JC correctly in SE
- tests for above cases
- minor code cleanup
2021-11-09 17:29:29 +05:30
Deepesh Garg
20bc613b81
Merge pull request #28294 from ruchamahabal/fix-hr-patch-breaking
fix(India setup): setup company independent fixtures for patch
2021-11-09 17:27:13 +05:30
Deepesh Garg
8a253ed1f3
Merge pull request #28238 from nextchamp-saqib/perf-financial-statements
perf: improve financial statement loading time
2021-11-09 16:29:58 +05:30
Rucha Mahabal
88b5bda34b fix(India setup): setup company independent fixtures for patch 2021-11-09 16:04:52 +05:30
Sagar Vora
da22744e0f
fix: specify fields to be set in Lead (#28288) 2021-11-09 15:49:32 +05:30
rohitwaghchaure
f57538bd2a
Merge pull request #28150 from anupamvs/manufacturing-work-order-stop
feat: provision to close the Work Order
2021-11-09 15:45:53 +05:30
Jannat Patel
17acb08545
fix: sum of components in salary register (#28237)
* fix: sum of components in salary register

* fix: sum of deduction components

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-11-09 15:21:51 +05:30
Subin Tom
c78b8b7897 fix: Shipping Rule picking up old net_rate 2021-11-09 14:46:45 +05:30
Saqib
4a3cef6436
fix: update 'current_invoice_end' after processing invoice (#28278) 2021-11-09 14:16:38 +05:30
Ankush Menat
34f5283c17
fix: show full item name in search widget (#28283) 2021-11-09 11:55:33 +05:30
Anupam Kumar
092936d8ba
Merge branch 'develop' into manufacturing-work-order-stop 2021-11-09 10:51:09 +05:30
Anupam
663a7afe4d fix: get_planned_qty chnages 2021-11-09 10:50:38 +05:30
Bibin
0e8e7e21c3
fix: filter only submitted fees in student fee collection report (#28280)
* Update student_fee_collection.json

Fix: filter and show only submitted fees documents

* fix: add total row for the student fee collection
2021-11-09 10:02:05 +05:30
Anupam
27709a1c71 fix: test cases 2021-11-09 09:56:58 +05:30
Deepesh Garg
94d70bca9e
fix: Resolve conflicts 2021-11-08 18:48:46 +05:30
Subin Tom
45fd819729 fix: company condition fix, added company field
(cherry picked from commit 7ad2717accea61883f98d418b4abed47ca3937a8)
2021-11-08 13:12:28 +00:00
Subin Tom
d2915c6bc7 fix: fixed company field, updated patch
(cherry picked from commit 7f2d304f32fdf580a354c1dbba58189cdd4f35f2)

# Conflicts:
#	erpnext/patches.txt
2021-11-08 13:12:27 +00:00
Subin Tom
e51c4ba8a9 fix: Added company field, filtered account heads
(cherry picked from commit 902c03cd375c7b1b2f35cff4dfbc5f1ff3e4cd56)
2021-11-08 13:12:25 +00:00
Subin Tom
75e9100a53 fix: Fixed customer address variable, sales invoice item field currency issue
(cherry picked from commit 904010ab645fdb16f09072c062269945f7747712)
2021-11-08 13:12:25 +00:00
Deepesh Garg
2bf3b0fcac
Merge pull request #28272 from deepeshgarg007/ksa_vat_fixes
fix: KSA VAT setup issues
2021-11-08 18:08:49 +05:30
Deepesh Garg
0950459b0f
Merge pull request #28065 from Anuja-pawar/gst-category
fix(minor): check if gst_category exists while validating GSTIN
2021-11-08 17:53:10 +05:30
Deepesh Garg
07e7b92383
Merge pull request #28185 from vorasmit/ewaybill-fix
fix(regional): incorrect `totalValue` in ewaybill JSON
2021-11-08 17:52:07 +05:30