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

2105 Commits

Author SHA1 Message Date
Ankush Menat
3638fbf06b fix: repost items with repeating item-warehouses 2022-03-02 13:11:04 +05:30
Deepesh Garg
d95f8934aa fix: Test cases with discount 2022-03-01 23:09:59 +05:30
Ankush Menat
afb69b0b7f
Merge branch 'develop' into item_discounts_quotation 2022-03-01 11:49:25 +05:30
Ankush Menat
bbc4710fa3 fix: apply margin on duplicated doc too 2022-03-01 11:48:28 +05:30
Rohit Waghchaure
39d3f20d9b fix: removed validation to check zero qty 2022-02-28 14:29:07 +05:30
Deepesh Garg
1bdcb73d5d
Merge pull request #29879 from deepeshgarg007/misc_fixes 
fix: Validate party account with company
 2022-02-23 11:22:08 +05:30
Deepesh Garg
a61790c00f fix: Remove unintended changes 2022-02-22 20:58:10 +05:30
Deepesh Garg
3a547cb0d9 fix: Item discounts for quotation 2022-02-22 16:25:32 +05:30
Rucha Mahabal
4738367d64
fix: boarding task dates not set when activity begins on is set to 0 (#29921) 2022-02-21 22:54:46 +05:30
Ankush Menat
5718777a2b fix: consider batch_no when getting incoming rate 2022-02-21 18:02:40 +05:30
Ankush Menat
342d09a671 feat: get_valuation_rate batch wise 
This function is used to show valuation rate on frontend and also as
fallback in case values aren't available. Add "batch_no" param to get
batch specific valuation rates.

Co-Authored-By: Alan Tom <2.alan.tom@gmail.com>
 2022-02-21 18:02:40 +05:30
Deepesh Garg
5a2b571aa9 fix: Validate party account with company 2022-02-18 20:05:49 +05:30
Ankush Menat
c36bd7e1a6 fix: avoid creating bins without item-wh 
Co-Authored-By:  Shadrak Gurupnor <30501401+shadrak98@users.noreply.github.com>
Co-Authored-By: Saurabh <saurabh6790@gmail.com>
 2022-02-17 19:52:01 +05:30
Saqib Ansari
b35b637d01
Merge pull request #29701 from nextchamp-saqib/consolidation-round-off-err 
fix(pos): incorrect grand_total in case of inclusive taxes on item
 2022-02-09 16:42:30 +05:30
Saqib Ansari
75256863c6 fix(test): do not enable negative stock 2022-02-09 16:07:33 +05:30
Saqib Ansari
ab36b27a94 fix: ignore pricing rule in all transactions 2022-02-09 10:10:17 +05:30
Saqib Ansari
c2b83a0283 fix(test): case if write off is calculated as negative amount 2022-02-08 17:36:39 +05:30
Saqib Ansari
3f962739fb Merge branch 'develop' of https://github.com/frappe/erpnext into consolidation-round-off-err 2022-02-08 16:02:18 +05:30
Saqib Ansari
4f4395545e
Merge branch 'develop' into fix-ignore-pricing-rule 2022-02-08 15:29:28 +05:30
Saqib Ansari
0f913e0173
Merge branch 'develop' into bug_invoice_creation_throws_typeerror 2022-02-08 11:51:26 +05:30
Saqib Ansari
4c3d751421
Merge branch 'develop' into fix-ignore-pricing-rule 2022-02-08 11:42:33 +05:30
Saqib Ansari
0452d7de20 fix(pos): incorrect grand_total in case of inclusive taxes on item 2022-02-08 11:26:23 +05:30
Ankush Menat
0ca60afc3f
fix: ignore cancelled SLEs (#29679) 2022-02-08 10:24:19 +05:30
Ankush Menat
e6ab8df8f2 refactor: simplify get_items_and_warehouses 
Also remove dead code related to stock reconciliation_json.
 2022-02-07 22:55:56 +05:30
Ankush Menat
c56d07dee3 fix: consider packed items too when reposting 2022-02-07 22:55:56 +05:30
Saqib Ansari
4655e115d0
Merge branch 'develop' into bug_invoice_creation_throws_typeerror 2022-02-07 20:04:59 +05:30
Deepesh Garg
cec971b5db
Merge pull request #29349 from alyf-de/disable-item-tax-category 
feat: option to disable Item Tax Template and Tax Category
 2022-02-07 11:01:03 +05:30
Deepesh Garg
36f4fb0585 fix: Incorrect tax template in Sales Invocie via data import 
(cherry picked from commit 20f321a88980d231f52702e3d32e122022316152)
 2022-02-06 16:24:26 +00:00
Deepesh Garg
d679692472 fix: Billing status for zero amount ref doc 2022-02-06 11:35:23 +05:30
Raffael Meyer
b5242df15b
Merge branch 'develop' into disable-item-tax-category 2022-02-04 18:10:39 +01:00
Saqib Ansari
9432d8edd1
Merge branch 'develop' into bug_invoice_creation_throws_typeerror 2022-02-04 10:20:43 +05:30
Ankush Menat
551f2967da
Merge pull request #27923 from marination/e-commerce-refactor-develop 
refactor: E-commerce (port to develop)
 2022-02-03 14:14:08 +05:30
Ankush Menat
41a95e5624
fix: ignore empty customer/supplier in item query (#29610) 
* fix: dont try to filter by customer/supplier if None

* test: item query with emtpy supplier
 2022-02-03 13:02:13 +05:30
Saqib Ansari
5a7236efcd
Merge branch 'develop' into fix-ignore-pricing-rule 2022-02-02 21:47:51 +05:30
Marica
780e29b42e
Merge branch 'develop' into e-commerce-refactor-develop 2022-02-02 10:45:14 +05:30
Deepesh Garg
528c71382f
feat: Provisional accounting for expenses (#29451) 
* feat: Provisonal accounting for expenses

* fix: Method for provisional accounting entry

* chore: Add test case

* fix: Remove test case

* fix: Use company doctype

* fix: Add provisional expense account field in Purchase Receipt Item

* fix: Test case

* fix: Move provisional expense account to parent

* fix: Patch
 2022-02-01 14:42:55 +05:30
ruthra kumar
9bd56b0f79 fix: typeerror on invoice creation from SO/PO 2022-02-01 14:14:04 +05:30
rohitwaghchaure
62e5aa7d72
Merge pull request #29359 from KrithiRamani/foc_item 
fix: bypass selling price validation for free item
 2022-02-01 11:54:01 +05:30
Ankush Menat
6cd7c47409 Merge branch 'develop' into e-commerce-refactor-develop 2022-01-31 17:14:36 +05:30
Saqib Ansari
1170bee951
Merge pull request #29480 from nextchamp-saqib/revert-drop-einvoicing 
revert: "refactor!: drop e-invoicing integration from erpnext"
 2022-01-31 11:35:48 +05:30
Rucha Mahabal
36882f3734
fix: Employee Onboarding and Separation UX (#29504) 2022-01-29 15:27:36 +05:30
Ankush Menat
e177c5277f fix: extend sr_no cleanup to packed items too 2022-01-29 14:01:21 +05:30
Ankush Menat
b20df3745e refactor: reusable clean_serial_nos 2022-01-29 14:01:21 +05:30
Saqib Ansari
8a66a7ad46
Merge branch 'develop' into fix-ignore-pricing-rule 2022-01-29 12:42:00 +05:30
Saqib Ansari
c5782b0e71 revert: "refactor!: drop e-invoicing integration from erpnext (#26940)" 
This reverts commit c335962827.
 2022-01-27 20:09:56 +05:30
marination
78b6b29a57 fix: Use get for conditionally available fields while setting missing values 
- Due to custom field "supplier" and missing field "supplier_address", dot operator breaks
- Make sure to use "get" instead of just dot operator if field is in some doctypes, not all
 2022-01-24 13:39:10 +05:30
Saqib Ansari
58cc3b32fa
Merge pull request #29334 from nextchamp-saqib/grouped-asset-purchase 2022-01-21 15:33:13 +05:30
Ankush Menat
ea5efd0791 perf: single query to update serial nos 2022-01-21 15:27:10 +05:30
Saqib Ansari
b8c41e3030 test: item price on remove pricing rule 2022-01-20 13:06:56 +05:30
Krithi Ramani
8c536ffb20 bypass selling price validation for free item 2022-01-19 15:27:09 +05:30
barredterra
f60e040d69 feat: option to disable Item Tax Template 2022-01-18 21:15:27 +01:00
Saqib Ansari
35a6b58c12 feat: purchase grouped asset 2022-01-18 13:10:23 +05:30
Marica
dbda10e092
Merge pull request #28987 from ankush/fix/srvaluation 
fix: incorrect serial no valuation
 2022-01-17 16:55:21 +05:30
Ankush Menat
8f5772463c fix: dont update sle values from get_gl_entries 2022-01-16 12:42:44 +05:30
Ankush Menat
fcc885bc16 fix: get incoming rate only if not return 2022-01-16 12:40:25 +05:30
Deepesh Garg
14e0d00a61
Merge pull request #29115 from deepeshgarg007/deferred_revenue_multi_currency_jv 
fix: Deferred revenue booking for multi currency invoices via JV
 2022-01-15 18:55:41 +05:30
Marica
efcfb825d7
Merge pull request #29257 from marination/fix-reset-wh-defaults 
fix: Avoid resetting Default wh fields for Manufacture Entry
 2022-01-12 16:44:33 +05:30
Marica
b5abf68b0d
Merge branch 'develop' into e-commerce-refactor-develop 2022-01-12 02:52:03 +05:30
Ankush Menat
33aad4b950 fix: UOM autocomplete broken 
All new recent sites seem to have all UOMs as disabled by default. The
desired behaviour is exact opposite of this.
 2022-01-11 17:49:30 +05:30
Deepesh Garg
30a647ff80 fix: Handle frozen books while handling 2022-01-07 19:52:38 +05:30
Deepesh Garg
b83608b029
Merge pull request #28994 from nextchamp-saqib/zero-qty-debit-note 
fix: cannot create debit note with zero qty
 2022-01-07 18:35:24 +05:30
Deepesh Garg
f6f449ed18
Merge pull request #29176 from deepeshgarg007/outstanding_amount_anomaly 
fix: Inconsistency in calculating outstanding amount
 2022-01-07 13:28:52 +05:30
Deepesh Garg
9d3a5c3184 fix: Inconsistency in calculating outstanding amount 2022-01-06 18:58:49 +05:30
Ankush Menat
733c9defdf
fix: update idx after updating items in so/po (#29134) 2022-01-04 18:39:30 +05:30
Saqib Ansari
79ccf80faf
Merge branch 'develop' into zero-qty-debit-note 2021-12-29 17:32:16 +05:30
Pruthvi Patel
fc0dd3fcd7
Merge branch 'develop' into fix-invoice-statuses 2021-12-29 13:45:35 +05:45
Deepesh Garg
7ad149f9fe fix: Start date validation for deferred invoices 2021-12-23 14:39:20 +05:30
Saqib Ansari
2be5104848 fix: cannot save debit note with zero quantity 2021-12-23 11:52:10 +05:30
Saqib Ansari
04ea42ce52 fix(sales-invoice): cannot create debit note with zero qty 2021-12-22 13:23:42 +05:30
Pruthvi Patel
16a90d3e60
Update erpnext/controllers/accounts_controller.py 
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-12-20 13:24:19 +05:30
Pruthvi Patel
0799f378b4 fix: consider Discounted status 2021-12-20 13:18:42 +05:30
Pruthvi Patel
6c96ed4e11 refactor: update_invoice_status with query builder 2021-12-20 13:18:42 +05:30
Deepesh Garg
a7f15a0eea Merge branch 'develop' of https://github.com/frappe/erpnext into party_account_currency_check 2021-12-12 21:09:11 +05:30
Sagar Sharma
6485ac4e59
fix: misleading "Set Default X" fields after saving (#28798) 
* fix: misleading "Set Default X" fields after saving

* refactor: remove unncessary code and minor formatting

* fix: extend to more doctypes and correct fieldnames

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-12-09 17:04:00 +05:30
Ankush Menat
bb00d38dd7
Merge branch 'develop' into asset-capitalization 2021-11-30 19:32:11 +05:30
mergify[bot]
071118fa4e
fix: Unable to search project by project name in Sales Invoice (bp #28648) 
(cherry picked from commit 08b7c856b2ee94d1f8ac2c019c556eef4d7dd7da)

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-11-30 13:15:20 +00:00
Raffael Meyer
e10ab1626c
feat: Grant commission on certain items only (#27467) 
Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2021-11-30 17:54:18 +05:30
xdlumertz
cdaf0a04cf
fix(ux): allow translations (#28455) 
* Translation

* Translations

Co-authored-by: xdlumertz <alexandrelumertz@gmail>
 2021-11-27 15:03:35 +00:00
Deepesh Garg
38dfb60243
Merge pull request #27348 from deepeshgarg007/advance_tds_allocation_gl 
fix (refactor): Tax Withholding for Advances using Payment Entry against suppliers
 2021-11-26 14:28:50 +05:30
Saqib
9c913c9b2d
fix: over billing validation (#28218) 2021-11-26 12:00:13 +05:30
Deepesh Garg
7f06c8ca57 fix: Incorrect indentation 2021-11-26 10:27:57 +05:30
Deepesh Garg
f07f010962 fix: Add tests 2021-11-25 23:58:16 +05:30
Ankush Menat
0a2964dc82 fix: ignore permissions while creating reposts 2021-11-25 16:37:19 +05:30
Ankush Menat
45dd46be3d feat: option to select reposting method 
In current implementation selecting Item-Warehouse based reposting is
better for few users, who don't use depenent SLEs but have frequent
transactions involving same items.

This change lets them switch to item-warehouse based reposting if
required.

Only use this if you understand technicalities of stock reposting. This
is experimental but will become mainstream in coming days.
 2021-11-25 16:37:19 +05:30
Ankush Menat
d220e08ba4 refactor: reuse get_items_to_be_repost function 2021-11-25 16:37:19 +05:30
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
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
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
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
Subin Tom
a8e2c02e14 fix: fixed tests, separated a method for shipping charges 2021-11-16 19:06:49 +05:30
marination
80fbe16be8 test: Product Query & Filter Engine, Item Group Page 
- Test for ProductQuery engine and ProductFilters engine
- Test for engine for Item Group too
- Renamed ‘product_configurator’ to ‘variant_selector’
- Cleaned up filters.py
- Modal freeze backdrop lighter only in cart, since there’s nothing over it
- Fixed unusual spacing in variant selector dialog
- Made `get_child_groups_for_website` more readable
- Replaced ‘Configure’ with ‘Select’ for variant selection
 2021-11-16 17:21:17 +05:30
marination
f9929ed8a6 Merge branch 'develop' of https://github.com/frappe/erpnext into e-commerce-refactor-develop 2021-11-16 16:06:07 +05:30
Marica
4afcbfdc08
Merge branch 'develop' into pr-return-ux 2021-11-16 15:15:48 +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
Deepesh Garg
74ccaeb07d
Merge branch 'develop' into shipping-rule-updation-error 2021-11-15 20:34:05 +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
Deepesh Garg
88648570d7 fix: Default party account getting overriden in invoices 2021-11-12 12:39:30 +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
Saif Ur Rehman
13f8edd43f Merge remote-tracking branch 'upstream/develop' into asset-capitalization 
# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.py
 2021-11-09 12:17:17 +05:00
Ankush Menat
34f5283c17
fix: show full item name in search widget (#28283) 2021-11-09 11:55:33 +05:30
marination
5fb5a757cf refactor: (ux) Accepted/Rejected/Received Qty UX 2021-11-08 13:23:42 +05:30
Ankush Menat
8fe5feb6a4 chore: remove all six compat code 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
Saif Ur Rehman
dc3c27fd1b fix(Asset Capitalization): update code for changes in depreciation logic 2021-11-04 13:47:33 +05:00
Saif Ur Rehman
2d9da22721 Merge branch 'develop' of https://github.com/frappe/erpnext into asset-capitalization 
# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.py
#	erpnext/assets/doctype/asset/test_asset.py
#	erpnext/assets/workspace/assets/assets.json
 2021-11-04 12:48:33 +05:00
Subin Tom
75a76e634d
fix: POS consolidated invoice rounded total issue (#28006) 2021-10-29 16:45:04 +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
Deepesh Garg
aa9e78bed1 fix: Accounting Dimension filters not honouring user permissions 2021-10-29 12:45:19 +05:30
Deepesh Garg
051aaa708d fix: Ignore PO on So cancel 2021-10-29 11:35:34 +05:30
GangaManoj
d24cfff388 fix: Remove unused imports 2021-10-28 20:06:48 +05:30
GangaManoj
8844fdbf23 fix: Remove print statements 2021-10-28 19:26:09 +05:30
Deepesh Garg
8e2b4ef456
Merge branch 'develop' into unlink-po-on-cancelling-so 2021-10-28 14:44:34 +05:30
Ankush Menat
2221c9ed89 fix: don't show blocked supplier in autocomplete 2021-10-27 19:46:06 +05:30
Deepesh Garg
af9ead84e9
Merge pull request #28080 from deepeshgarg007/payment_terms_precision_validate 
fix: Payment Terms validation precision
 2021-10-27 11:48:23 +05:30
Ankush Menat
6ec047cba9
fix(ux): overbiling message in SO->SI, PO->PI (#28088) 2021-10-27 10:30:05 +05:30
Deepesh Garg
9c1705205f fix: Payment Terms validation precision 2021-10-25 20:06:24 +05:30
Sagar Vora
8d9d0987fe
fix: incorrect status being set in Invoices (#28019) 
Co-authored-by: Pruthvi Patel <pruthvipatel145@gmail.com>
 2021-10-20 19:15:35 +05:30
Marica
8cf188d9c0
fix: Use strip instead of lstrip and rstrip 
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
 2021-10-14 19:21:41 +05:30
marination
41035b0330 fix: Retain space inside Serial no string while cleaning serial nos 2021-10-14 18:31:37 +05:30
Deepesh Garg
6f107da165
perf: Add indexes in stock queries and speed up bin updation #27758 
perf: Add indexes in stock queries and speed up bin updation
 2021-10-12 20:15:55 +05:30
marination
22f41a17b7 chore: Removed Shopping Cart Module 
- Moved all files and web templates from Shopping Cart to E-commerce module
- Made Shopping Cart module obsolete
- Moved select E-commerce related files from Portal to E-commerce module
- Minor cleanups
- Fixed Shopping Cart and Product Configurator tests
 2021-10-12 16:54:11 +05:30
marination
025574d9b5 chore: Removing Item's Website section & references 
- Removed old onboarding slide json and `create_onboarding_docs` methods
- Removed website sections from Item master
- Removed references to item website fields
- Shifted Item doctype website methods to Website Item
- Removed WebsiteGenerator from Item doctype
- Website Items in Homepage Products section
- Removed redundant code from item_group.py
- Fix: Item field filters won’t appear in website
 2021-10-12 16:03:19 +05:30
mergify[bot]
233bf5dd29
fix: using DN for transfer w/o internal customer (backport #27798) (backport #27805) (#27807) 
* fix: using DN for transfer w/o internal customer (backport #27798) (#27805)

* fix: using DN for transfer w/o internal customer (#27798)

This used to be work before though not "advertised", since a lot of
users have started using it as feature, it can't be broken now.

(cherry picked from commit df1f8fddf6e2f4106c1a2778614ba9a1dc5ff67e)

* fix(ux): use toast instead of popup

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
(cherry picked from commit fa944382c53bdeeb92f2dcc876e2c11ed03e20cc)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py

* fix: resolve conflict

* fix: resolve conflicts

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-10-05 16:16:21 +05:30
ChillarAnand
a1d3a09d3c Merge branch 'develop' into care 2021-10-04 09:46:34 +05:30
Saqib
e8ff649298
Merge branch 'develop' into fix-32644 2021-09-26 17:07:46 +05:30
Saqib Ansari
78ad50efc2 fix: cost center in exchange gain loss gl entry 2021-09-26 16:08:15 +05:30
Saqib Ansari
64efe8bf15 fix: setting of gain/loss if party account is in company currency 2021-09-26 15:46:13 +05:30
Sagar Vora
c8b9a55e96
feat: add Partly Paid status in Invoices (#27625) 2021-09-22 12:11:35 +05:30
GangaManoj
e77534fe13 fix: Unlink PO on cancelling SO 2021-09-20 21:18:18 +05:30
Ganga Manoj
41678faeee
Merge branch 'develop' into unlink-po-on-cancelling-so 2021-09-20 21:16:31 +05:30
GangaManoj
8396f24e70 fix: Unlink PO on cancelling SO 2021-09-20 19:01:46 +05:30
Ankush Menat
21a955d20b
fix(ux): better error message 
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-09-20 17:14:35 +05:30
Ankush Menat
5e4fbba753
refactor: add guard clause in for loop 
Reduce overly indented code/improve readability.
 2021-09-20 16:40:51 +05:30
Ankush Menat
43bf82b58b
fix: warn when overbilling checks are skipped. 2021-09-20 16:31:20 +05:30
Ankush Menat
648b2d72a5
perf: extract loop invariant db calls 2021-09-20 15:27:12 +05:30
Saif Ur Rehman
e832944dfe fix(Asset): On Depreciation reversal, remove Journal Entry reference 2021-09-16 23:22:31 +05:00
Saif Ur Rehman
9ae0380a96 chore(Asset Capitalization): isort linting 2021-09-14 15:09:58 +05:00
DeeMysterio
aa82624f31
Merge pull request #27281 from DeeMysterio/party-specific-items 
feat: link items to supplier / customer
 2021-09-14 13:58:18 +05:30
Shariq Ansari
9aa6f52edd
fix: Webform Permission for custom doctype (#26232) 
* fix: Webform Permission for custom doctype

* fix: sider fix

* fix: app check condition for getting correct list_context

* chore: Better naming convention

* test: Added test case to check permission for webform of custom doctype

* chore: linting issue

* chore: linting issue

* fix: sider fix

* test: minor changes

* chore: linter and better naming method

* chore: linter fix

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-09-14 12:49:08 +05:30
Saif Ur Rehman
7a5d75b68d feat(Asset Capitalization): Submission and Cancellation 2021-09-13 23:01:52 +05:00
Ankush Menat
62fc544280
test: basic tests for controllers/queries (#27422) 2021-09-10 12:46:35 +05:30
ChillarAnand
c8565c7090 chore: Removed healthcare module code in other modules 2021-09-06 20:47:27 +05:30
Deepesh Garg
25d208aa8a fix: GL Entries on advance TDS allocation 2021-09-06 10:37:41 +05:30
ChillarAnand
e913e277d9 chore: Rename imports from erpnext to healthcare 2021-09-02 19:47:39 +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
b147b85e6a
chore: whitespace / eof fixes 2021-09-01 16:57:21 +05:30
Ankush Menat
55b24345a0
fix: remove unused format from query 
doctype is not used in query and parent alone is enough to identify
packed items.
 2021-09-01 15:33:37 +05:30
Frappe PR Bot
81fb493850
fix: payment terms on Sales Order when Invoice Portion field is empty (#27259) 2021-08-31 19:01:03 +05:30
Anuja Pawar
3e404f15ff
refactor: payment reconciliation tool (#27128) 2021-08-31 18:59:29 +05:30
Rucha Mahabal
71b7c63ec0
feat: Ability to schedule onboarding and separation activities (#26738) 
* refactor: employee onboarding form clean-up

* feat: ability to schedule onboarding / separation tasks

* feat: skip holidays while setting boarding activity dates

* chore: remove unused child table - Employee Onboarding Activity

* fix: tests

* fix: employee separation test
 2021-08-27 11:12:24 +05:30
Marica
f4dc9ee2aa
fix: Don't create inward SLE against SI unless is internal customer enabled (#27086) 
* fix: Dont create inward SLE against SI unless is internal customer enabled

- Check if is internal customer enabled apart from target warehouse
- Test to check if inward SLE is made if target warehouse is accidentally set but customer is not internal

* test: Use internal customer for delivery of bundle items to target warehouse

- created `create_internal_customer` util
- reused it in delivery note and sales invoice tests
- use internal customer for target warehouse test in delivery note
 2021-08-26 13:12:51 +05:30
Deepesh Garg
e2af9d5761
Merge pull request #27039 from nextchamp-saqib/common-party-acc 
feat: common party accounting
 2021-08-26 12:58:59 +05:30
rohitwaghchaure
fe4540d74d
fix: allow to change rate manually in case of stand-alone credit note (#27036) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2021-08-26 12:52:36 +05:30
Deepesh Garg
27ca9866e3 Merge branch 'develop' of https://github.com/frappe/erpnext into party_account_currency_check 2021-08-25 20:47:16 +05:30
Saqib Ansari
c6c7a8b5cf fix: cost center & naming series 2021-08-25 20:17:04 +05:30
Saqib Ansari
7254368fc5 perf: reduce number of queries to get party link 2021-08-25 20:15:23 +05:30
Saqib Ansari
881301ca9b Merge branch 'develop' of https://github.com/frappe/erpnext into common-party-acc 2021-08-25 20:02:27 +05:30
Saqib
62114b226f
feat: unreconcile on cancellation of bank transaction (#27109) 2021-08-25 16:25:51 +05:30
Pruthvi Patel
7c957d72b3
perf: reduce number of queries to validate selling price (#26225) 
* perf: reduce number of queries to validate selling price

* fix: improved flow and formatting

* fix: improve condition and use of `as_dict`

Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2021-08-24 21:24:25 +05:30
Nabin Hait
b99a8cb96e
Merge pull request #27087 from deepeshgarg007/validate_due_date_fix 
fix: Ignore due date validations if payment terms are copied from orders/receipts
 2021-08-24 21:10:44 +05:30
Saqib
1db812ab9f
Merge branch 'develop' into common-party-acc 2021-08-24 17:27:43 +05:30
Subin Tom
2e5525aba9
fix: Correct price list rate value in return si (#27097) 2021-08-24 17:24:41 +05:30
Ankush Menat
6de7b8ea93
fix: discard empty rows from update items (#27021) 2021-08-24 12:18:40 +05:30
Deepesh Garg
bd709f8ab0 fix: Ignore due date validations if payment terms are copied from orders/receipts 2021-08-23 19:05:52 +05:30
Subin Tom
7d627df4db
fix: pos return payment mode issue (#26872) 2021-08-23 11:05:07 +05:30
Deepesh Garg
60915e874d test: Update test cases for currency change validation 2021-08-21 23:05:48 +05:30
Deepesh Garg
1435800249 Merge branch 'develop' of https://github.com/frappe/erpnext into party_account_currency_check 2021-08-21 20:14:17 +05:30
Saqib
5395f56c88
Merge branch 'develop' into common-party-acc 2021-08-20 20:42:50 +05:30
Saqib
c335962827
refactor!: drop e-invoicing integration from erpnext (#26940) 2021-08-20 11:10:46 +05:30
Saqib Ansari
977b09b6ba feat: auto create advance entry on invoice submission 2021-08-19 18:09:35 +05:30
Ankush Menat
4551d7d602
chore: mass trailing whitespace and EOF fixes 2021-08-19 13:43:28 +05:30
Frappe PR Bot
44434ff70f
fix: date_unchanged calculation in "Update Items" (#26992) (#27011) 
Branch corrected https://github.com/frappe/erpnext/pull/26058

  ERPNext generates "Cannot set quantity less than delivered quantity" error even the delivered qty is zero when user clicks "Update Items".
  "date_unchanged" variable gets false value because of new_date is string.

  "getdate(new_date)" corrects the date comparison.

  ![ERPNext_PR](https://user-images.githubusercontent.com/710051/121928377-c0263180-cd48-11eb-8cd9-eda7dace09d6.gif)

(cherry picked from commit d8a7abcd02f674bf6c4270a817ae9762a0b57140)

Co-authored-by: Türker Tunalı <turkert@hotmail.com>
 2021-08-18 18:33:06 +05:30
Subin Tom
333e44eb47
fix: Dimension filter query fix to avoid including disabled dimensions (#26988) 
* reverting ot v12.7.1

* fix: Dimension filter query fix to not display disabled dimensions

Co-authored-by: Subin Tom <subin-home@Subins-MacBook-Air.local>
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
 2021-08-18 16:17:54 +05:30
Sagar Vora
d932cba38a
Merge pull request #26976 from resilient-tech/fix-incorrect-modified 
fix: Incorrect `modified` time in documents that inherit from `StatusUpdater`
 2021-08-17 13:17:09 +05:30
Deepesh Garg
fa79e94b49 Merge branch 'develop' of https://github.com/frappe/erpnext into party_account_currency_check 2021-08-15 18:59:08 +05:30
Deepesh Garg
5122948450 Merge branch 'develop' of https://github.com/frappe/erpnext into enable-discount-accounting 2021-08-13 16:00:20 +05:30
Deepesh Garg
80c85dd17c fix: Account currency validation for first transaction 2021-08-12 15:39:07 +05:30
Deepesh Garg
a7054560da
Merge branch 'develop' into po-payment-terms 2021-08-11 19:31:30 +05:30
Deepesh Garg
bff3b0962a fix: Override template only if setting is enabled 2021-08-10 23:58:27 +05:30
Afshan
b614834efe
fix: unseting of payment if no pos profile found (#26884) 2021-08-10 21:33:58 +05:30
Anuja Pawar
0e337be065
fix: cost center & account validation in Sales/Purchase Taxes and Charges (#25929) 2021-08-10 17:26:35 +05:30
Marica
f6ea00e029
Merge branch 'develop' into serial-no-space 2021-08-10 13:17:08 +05:30
Afshan
f5b5be9644
Merge branch 'develop' into po-payment-terms 2021-08-10 09:32:08 +05:30
Deepesh Garg
bcf56e64ba fix: Ignore default payment term templates when coping payment terms from orders 2021-08-09 18:53:14 +05:30
GangaManoj
5b33e75c65 fix: Fetch discount details from Payment Terms only if Discount Type = Percentage 2021-08-09 18:53:14 +05:30
GangaManoj
0588382c38 fix: Stop fetching amount while fetching Payment Terms 2021-08-09 18:53:14 +05:30
GangaManoj
54d1336d11 fix: Condition for fetching Payment Terms from Sales/Purchase Orders 2021-08-09 18:53:13 +05:30
Afshan
b3bbebd27c
fix: add parameter for db insert while adding item tax (#26855) 2021-08-09 14:39:32 +05:30
Marica
4c929b6994
Merge branch 'develop' into serial-no-space 2021-08-09 10:50:09 +05:30
Saqib
668f442139
Merge branch 'develop' into po-payment-terms 2021-08-06 13:42:10 +05:30
Deepesh Garg
ad7bb316c1 fix: GL Entries for discount amount with item qty greater than 1 2021-08-02 12:41:06 +05:30
Deepesh Garg
92f7a5a390 fix: GL For taxes if discount applied on Grand Total 2021-08-02 12:39:43 +05:30
Rohit Waghchaure
343143037c fix: conflicts 2021-08-01 14:45:24 +05:30
Rohit Waghchaure
2a14f255cf fix: COGS account in purchase receipt 2021-07-31 11:14:14 +05:30
Marica
7cbd755951
Merge branch 'develop' into serial-no-space 2021-07-30 14:09:19 +05:30
Saqib
d4ae1febe3
fix: gl entries for exchange gain loss (#26734) 2021-07-30 11:21:49 +05:30