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
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
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
Deepesh Garg
508832e90a
fix: Add patch to make custom fields
2021-11-08 17:46:24 +05:30
Deepesh Garg
c81d4734c4
fix: KSA VAT setup issues
2021-11-08 17:14:03 +05:30
Deepesh Garg
419e03954c
Merge pull request #28166 from Havenir/ksa-vat
...
feat(Print Format): KSA VAT Invoice
2021-11-08 15:27:02 +05:30
marination
5fb5a757cf
refactor: (ux) Accepted/Rejected/Received Qty UX
2021-11-08 13:23:42 +05:30
ahmadpak
8df50cf1e0
update(Print Format): Sales Invoice
...
- KSA VAT Invoice
Customer Identification Number Added
2021-11-08 09:29:33 +03:00
Ankush Menat
db3193dcab
chore: remove migration_hash ( #28263 )
2021-11-08 10:57:20 +05:30
mergify[bot]
c0b889b94d
fix: auto update price list rate ( #28255 ) ( #28256 )
...
* fix: auto update price list rate
* fix: hide field when auto insert isn't enabled
(cherry picked from commit bb3957eba35a5204a1a01e412dee596532bd525e)
Co-authored-by: Sagar Sharma <63660334+s-aga-r@users.noreply.github.com>
[skip ci]
2021-11-07 17:42:51 +05:30
Ankush Menat
8fe5feb6a4
chore: remove all six compat code
2021-11-05 11:16:29 +05:30
Ankush Menat
897e90ac55
chore: remove past module dependencies
2021-11-05 11:16:29 +05:30
Ankush Menat
6098e92ba9
chore: remove utf-8 compat code
2021-11-05 11:16:29 +05:30
mergify[bot]
25f647f067
fix: Bulk update of valid upto field wasn't working (bp #28242 )
...
* fix: Bulk update of valid upto field wasn't working
Check in dates for the price list was failing because valid_upto field was string. Converting to date fixed the problem.
* chore: extend fix and cleanup whitespace
Co-authored-by: Ankush Menat <ankush@frappe.io>
(cherry picked from commit 95a5ef1d416d54ecf0f557586b341b0dce2a0b05)
Co-authored-by: fatihustaoglu <46131068+fatihustaoglu@users.noreply.github.com>
2021-11-04 21:46:48 +05:30
Raffael Meyer
114028e473
feat: replace newline in remarks (DATEV report) ( #28152 )
2021-11-04 21:44:24 +05:30
marination
0aa237f38c
test: Stock Entry from JC correctness (items mapping and qty)
2021-11-04 20:14:28 +05:30
Marica
51fb543f67
Merge branch 'develop' into se-required-items-from-jc
2021-11-08 18:05:11 +05:30
Saqib Ansari
b7a44fe0a3
perf: improve financial statement loading time
2021-11-03 18:17:31 +05:30
Anupam
7044ae5e39
fix: testcases:
2021-11-03 17:41:04 +05:30
Noah Jacob
cb064b06ad
fix: added job_card_item link in material request ( #28222 )
...
* fix: added job_card_item links in material request
* fix: add no copy to row references
2021-11-03 11:53:57 +00:00
marination
3da03028f3
fix: Pull Items that are in JC in Stock Entry against JC
...
- Check if items pulled in stock entry are present in Job Card
- Code cleanup and removed redundant checks
Co-authored-by: Gavin D'souza <gavin18d@gmail.com>
2021-11-03 17:05:57 +05:30
Anuja Pawar
0d65a6e333
Merge branch 'develop' into gst-category
2021-11-03 15:49:22 +05:30
Anupam
cc15cf6ae2
fix: linter isuue
2021-11-03 13:54:46 +05:30
Anupam Kumar
8ebc412e8b
Merge branch 'develop' into manufacturing-work-order-stop
2021-11-03 13:41:37 +05:30
Anupam
ba47bd02b6
fix: sider isuue
2021-11-03 13:41:22 +05:30
Anupam
9b4c7e4796
fix: validate job card
2021-11-03 13:27:50 +05:30
Saqib
a5902fa3f8
Merge pull request #28187 from hrwX/subscription_active_fixes
...
fix: do not generate multiple invoices
2021-11-03 11:40:39 +05:30
Anuja Pawar
3c4484fbf9
Merge branch 'develop' into gst-category
2021-11-02 23:30:16 +05:30
Anuja Pawar
f2fbcc8124
fix: sider
2021-11-02 23:29:06 +05:30
Anupam
9c0906f1b5
fix: test cases
2021-11-02 20:43:00 +05:30
Deepesh Garg
11e90cc0be
Merge pull request #28205 from deepeshgarg007/lower_deduction_validation_fix
...
fix: Error on LDC creation
2021-11-02 20:27:18 +05:30
Deepesh Garg
66348e1a03
fix: Error on LDC creation
2021-11-02 20:26:40 +05:30
Marica
91112c49e1
Merge pull request #28202 from marination/serial-no-popup-with-scanner
...
fix: Serial Nos not set in the row after scanning in popup
2021-11-02 20:17:48 +05:30
hrwx
2bce193b81
Merge branch 'develop' of https://github.com/frappe/erpnext into subscription_active_fixes
2021-11-02 14:05:10 +00:00
Saqib
ec0a72423a
fix: Calculate depreciation_amount accurately ( #27585 )
2021-11-02 18:45:03 +05:30
marination
734b57deec
fix: Serial Nos not set in the row after scanning in popup
...
- Avoid whitspaces while calculating length of serial nos
2021-11-02 18:34:55 +05:30
Noah Jacob
857d87da97
fix: replaced "=" with "in" for multiple statuses in query #28193
...
fix: replaced "=" with "in" for multiple statuses in query
2021-11-02 17:52:45 +05:30
Saqib
7681600b5e
fix: test wdv method for indian region
2021-11-02 17:47:44 +05:30
hrwx
890a786858
fix: do not generate multiple invoices
2021-11-02 11:58:01 +00:00
GangaManoj
f047c6ffc8
fix: Test for WDV
2021-11-02 16:43:31 +05:30
Anuja Pawar
d72709dd81
fix(Payment Entry): splitting outstanding rows as per payment terms ( #27946 )
2021-11-02 16:28:46 +05:30
marination
48886ee705
chore: Add comment above fix for future reference
2021-11-02 15:57:41 +05:30
marination
048210a8f6
fix: Remove warehouse filter on Batch field for Material Receipt
2021-11-02 15:49:58 +05:30
Anupam
e36da4d137
fix: linter issues
2021-11-02 12:53:00 +05:30
Anupam
59e4fd980c
fix: linter issues
2021-11-02 12:46:00 +05:30
Anupam
530a0f481e
fix: added testcase
2021-11-02 12:39:13 +05:30
Smit Vora
e2d866d6a2
fix: regional(India) totalValue for ewaybill
2021-11-01 15:55:19 +05:30
Ankush Menat
1eab3a44f6
fix(ux): stock levels take time after item merge
...
Item merge creates a repost and depending on number of entries it can
take from 1 to n hours for it to finish. (depending upon queued up
reposts)
Added message so users don't feel confused till this operation is
finished.
2021-11-01 15:32:59 +05:30
Ankush Menat
f7ffe04a4b
fix: use warehouse to find company
2021-11-01 14:13:56 +05:30
Ankush Menat
a0727b2e82
fix: pass company while fetching valuation rate
...
If company is not supplied and valuation rate is 0, then default
company is used for checking if perpetual inventory is enabled or not.
This makes little sense as different companies can have different
setting for perpetual inventory.
2021-11-01 14:13:56 +05:30
Anupam Kumar
623776dd48
feat: added company field in prospect ( #28139 )
...
* feat: added company field in prospect
* fix: review changes
2021-11-01 13:37:31 +05:30
Anuja Pawar
dd3cadd46b
fix: update set_value query
2021-11-01 11:38:02 +05:30
Anuja Pawar
19f78c2f31
Merge branch 'develop' into gst-category
2021-11-01 11:30:23 +05:30
Deepesh Garg
ddcdf64f35
Merge pull request #28156 from kennethsequeira/ind-tx
...
fix: update tax template name for 18% GST
2021-10-31 18:53:40 +05:30
Anupam
264b0df9ff
fix: sider issue
2021-10-31 16:11:11 +05:30
Anupam
55e97dce8a
fix: sider issue
2021-10-31 14:45:36 +05:30
Anupam
e290fe0721
fix: sider issue
2021-10-31 14:42:10 +05:30
Anupam
5d4c5652af
feat: added confirm dialog on closing of workorder
2021-10-31 14:20:03 +05:30
Rohit Waghchaure
cae29b71d8
fix: patch update_category_in_ltds_certificate
2021-10-31 09:24:07 +05:30
ahmadpak
2a5beec885
new (Print Format): KSA VAT Invoice
2021-10-30 17:18:45 +03:00
Deepesh Garg
fb9e72cc8a
Merge pull request #28162 from deepeshgarg007/pan_field_missing_error
...
fix: Error for missing PAN no field
2021-10-30 19:29:26 +05:30
Deepesh Garg
541c892f97
fix: Error for missing PAN no field
2021-10-30 18:22:46 +05:30
Kenneth Sequeira
ad5cf467c0
fix: update tax template name for 18% GST
2021-10-30 13:07:36 +05:30
Anuja Pawar
f9e7dc3f62
Merge branch 'develop' into gst-category
2021-10-29 21:32:49 +05:30
Anuja Pawar
bc1e7bc15f
fix: re-writing sql query with ORM methods
2021-10-29 21:32:20 +05:30
Anuja Pawar
1a6e98ed48
fix(Payment Reconciliation): clear child tables on company/party change ( #28008 )
2021-10-29 20:52:47 +05:30
Ganga Manoj
15e9b5170d
fix: Make status filter optional ( #28126 )
2021-10-29 18:07:11 +05:30
Anupam
23af036894
feat: provision to close the Work Order
2021-10-29 17:27:17 +05:30
Deepesh Garg
eb720d18c3
Merge pull request #28145 from deepeshgarg007/coa_import_is_group
...
fix: COA importer importing all accounts as group
2021-10-29 17:04:20 +05:30
Ankush Menat
ff9cfe0d14
fix: sort by creation to break tie
2021-10-29 16:56:15 +05:30
Ankush Menat
f4b60a48f5
refactor: simplify sr no fetching
2021-10-29 16:56:15 +05:30
Ankush Menat
2aa019ae4c
fix: fetch serial nos from ledger unconditionally
2021-10-29 16:56:15 +05:30
Noah Jacob
deb6b38fab
refactor: replaced db.sql with qb
2021-10-29 16:56:15 +05:30
Noah Jacob
b44945380d
fix: incorrect amount of serial_nos fetched
2021-10-29 16:56:15 +05:30
Subin Tom
75a76e634d
fix: POS consolidated invoice rounded total issue ( #28006 )
2021-10-29 16:45:04 +05:30
Deepesh Garg
8ccd3fee9e
fix: COA importer importing all accounts as group
2021-10-29 16:08:52 +05:30
Deepesh Garg
199fc52917
Merge pull request #27994 from rtdany10/patch-8
...
fix: incorrect VAT Amount in UAT VAT 201 report
2021-10-29 14:42:02 +05:30
Deepesh Garg
7180d76b36
Merge pull request #28135 from deepeshgarg007/accounting_dimension_userperm
...
fix: Accounting Dimension filters not honouring user permissions
2021-10-29 14:39:58 +05:30
Marica
292419bc9e
fix: Skip empty rows while updating unsaved BOM cost ( #28136 )
...
- Dont try to get valuation rate if row has no item code
- Dont try to add exploded items if row has no item code
2021-10-29 13:49:27 +05:30
Ankush Menat
afe09d4e80
test: remove unnecessary creation of new company ( #28137 )
2021-10-29 13:45:07 +05:30
Deepesh Garg
aa9e78bed1
fix: Accounting Dimension filters not honouring user permissions
2021-10-29 12:45:19 +05:30
Anuja Pawar
4589f39875
Merge branch 'develop' into gst-category
2021-10-29 12:41:04 +05:30
Deepesh Garg
d0e2b52f51
Merge pull request #28122 from nemesis189/consolidated-finan-report-empty-list-error
...
fix: Consolidated Financial Report throws error for empty equity data list
2021-10-29 12:11:16 +05:30
Deepesh Garg
051aaa708d
fix: Ignore PO on So cancel
2021-10-29 11:35:34 +05:30
Anuja Pawar
d23b7a77b8
Merge branch 'develop' into gst-category
2021-10-28 23:22:03 +05:30
Ganga Manoj
61757c17ae
Merge branch 'develop' into unlink-po-on-cancelling-so
2021-10-28 21:06:00 +05:30
GangaManoj
d24cfff388
fix: Remove unused imports
2021-10-28 20:06:48 +05:30
GangaManoj
1a9d2684e2
fix: Remove debugger
2021-10-28 19:27:45 +05:30
GangaManoj
8844fdbf23
fix: Remove print statements
2021-10-28 19:26:09 +05:30
Deepesh Garg
812249e5d1
Merge branch 'develop' of https://github.com/frappe/erpnext into lower_deduction_cetificate_fixes
2021-10-28 19:01:51 +05:30
Deepesh Garg
09a5616e2d
fix: Rewrite patch using query builder
2021-10-28 19:01:24 +05:30
marination
8502ccb5b2
chore: Add comment hinting to reason
2021-10-28 16:53:45 +05:30
marination
27236b7e9e
fix: Remove RM Cost column as cost is not retrievable from Job card
2021-10-28 16:45:23 +05:30
Deepesh Garg
8e2b4ef456
Merge branch 'develop' into unlink-po-on-cancelling-so
2021-10-28 14:44:34 +05:30
Ankush Menat
b01635e1da
refactor!: remove hub #28117
...
refactor!: remove hub
2021-10-28 14:07:15 +05:30
Subin Tom
d786855d94
fix: Consolidated Financial Report throws error for empty equity data list
2021-10-28 13:19:19 +05:30
Saqib
f530764105
Merge branch 'develop' into fix-depr-after-sale
2021-10-28 12:43:51 +05:30
