2233 Commits

Author	SHA1	Message	Date
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.  (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
GangaManoj	c7c90244fe	fix: Check if Purchase Order has Payment Terms Template	2021-07-29 19:19:46 +05:30
Saqib	bbb96899a5	Merge branch 'develop' into po-payment-terms	2021-07-29 17:23:09 +05:30
Nabin Hait	ebbabf11e9	Merge pull request #25944 from ruchamahabal/fix-employee-onboarding-status ... fix: boarding status in Employee Onboarding and Separation	2021-07-29 15:24:54 +05:30
Ankush	f8343890b9	feat: don't recompute taxes (#26695)	2021-07-29 11:09:34 +05:30
Deepesh Garg	e79bfbb104	Merge pull request #26665 from ankush/dont_recompute_taxes ... feat: don't recompute taxes	2021-07-28 19:36:27 +05:30
Ankush Menat	dfdd1c6e02	feat: don't recompute taxes	2021-07-27 14:49:44 +05:30
Rohit Waghchaure	6b482ebb0f	fix: serial no and batch validation	2021-07-27 13:42:37 +05:30
Subin Tom	ed68f11a46	fix: Supplier invoice importer fix pre release (#26636) ... * fix: Supplier Invoice Importer fix Co-authored-by: Subin Tom <subin-home@Subins-MacBook-Air.local>	2021-07-26 16:47:36 +05:30
Subin Tom	fac88a3329	fix: Supplier Invoice Importer fix	2021-07-23 21:23:48 +05:30
Rohit Waghchaure	45d506c489	fix: serial no and batch validation	2021-07-23 16:40:45 +05:30
marination	eecfc4c0ae	fix: Clean Serial No input on Server Side	2021-07-22 13:23:54 +05:30
GangaManoj	4323f4bcac	fix: Modify set_payment_schedule() to include fetch_payment_terms_from_order()	2021-07-22 05:57:42 +05:30
Rohit Waghchaure	c14aa45720	fix: incorrect valuation rate calculation in gross profit report	2021-07-20 18:19:15 +05:30
Rucha Mahabal	99de84ebe1	Merge branch 'develop' into fix-employee-onboarding-status	2021-07-20 12:22:10 +05:30
GangaManoj	4105e27138	fix: Create GL Entries for Additional Discount Account	2021-07-20 03:46:02 +05:30
Ganga Manoj	0ea2934cd5	fix: GL Entry creation ... Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2021-07-19 23:44:55 +05:30
Ganga Manoj	63b7ecd0fe	fix: Use the item's project instead of the invoice's ... Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2021-07-19 23:44:21 +05:30
Ganga Manoj	980798c6fd	fix: Use the item's cost centre instead of the Invoice's ... Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2021-07-19 23:43:36 +05:30
GangaManoj	cde0cc0678	fix: Fetch Payment Terms from Sales/Purchase Orders	2021-07-17 22:53:21 +05:30
Ganga Manoj	bfb7256143	Merge branch 'develop' into enable-discount-accounting	2021-07-17 20:01:09 +05:30
GangaManoj	228499369c	fix: Switch debit and credit for ledger entries for discount applied on taxes for Purchase Invoice	2021-07-17 19:49:16 +05:30
GangaManoj	fa4c03e7a1	fix: Create ledger entries for discount applied on taxes in make_tax_gl_entries	2021-07-17 17:42:36 +05:30
GangaManoj	857501cbe1	fix: Make additional GL Entries for discount applied on taxes	2021-07-15 22:03:46 +05:30
Deepesh Garg	4478c547bf	fix: Unallocated amount for inclusive charges	2021-07-13 16:35:58 +05:30
Deepesh Garg	4a2e4748ac	fix: Unallocated amount for inclusive charges	2021-07-13 11:22:55 +05:30
GangaManoj	8f7b0a1753	fix: Create common function for discount accounting	2021-07-13 03:01:02 +05:30
Saqib	7fb64d1645	fix: exchange gain loss not set for advances linked with invoices (#26436)	2021-07-12 18:33:16 +05:30
Saqib	a20999cfbc	fix: exchange gain loss not set for advances linked with invoices (#25369)	2021-07-12 14:33:23 +05:30
marination	f67f13c384	chore: Test case for QI Rejection in Stock Entry ... - Use `get_single_value` instead of `get_doc` in validation - Test Case to check impact of stock settings on SE with rejected qi	2021-07-10 21:02:36 +05:30
Marica	9ba3fce4fd	fix: Consistent alert indicators	2021-07-10 21:02:28 +05:30
marination	654e9d85d1	fix: sider and semgrep	2021-07-10 21:02:19 +05:30
marination	9ac9a4ef21	feat: Optionally allow rejected quality inspection on submission	2021-07-10 21:02:03 +05:30
marination	c8a825c478	chore: Test case for QI Rejection in Stock Entry ... - Use `get_single_value` instead of `get_doc` in validation - Test Case to check impact of stock settings on SE with rejected qi	2021-07-10 18:26:36 +05:30
Marica	01be96adb2	Merge branch 'version-13-hotfix' into qi-rejection	2021-07-09 13:30:21 +05:30
Nabin Hait	fa006402b8	fix: merge conflict	2021-07-01 12:47:28 +05:30
Rohit Waghchaure	5d5dc56f94	fix: removed values out of sync validation from stock transactions	2021-06-26 22:29:19 +05:30
rohitwaghchaure	c1853ddf73	Merge pull request #26226 from rohitwaghchaure/fixed-removed-values-out-of-sync-on-stock-transaction-submission ... fix: removed values out of sync validation from stock transactions	2021-06-26 22:28:42 +05:30
Rohit Waghchaure	170f2ad056	fix: removed values out of sync validation from stock transactions	2021-06-26 21:42:47 +05:30
Ankush	532a224c44	fix: precision rate for packed items (#26046) (#26217) ... Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>	2021-06-25 13:28:01 +05:30
Noah Jacob	58daf5f916	fix: precision rate for packed items (#26046)	2021-06-25 12:52:17 +05:30
Ankush	21e44b19f0	perf: don't query unless required (bp #26175) ... re-order conditionals so queries are not evaluated unless required. # Conflicts: # erpnext/stock/doctype/batch/batch.py	2021-06-24 20:58:07 +05:30
Ankush	2ea750eadd	perf: don't query unless required (#26175) ... re-order conditionals so queries are not evaluated unless required.	2021-06-24 20:29:18 +05:30
Noah Jacob	ac0bc1f170	fix: precision rate for packed items (#26208)	2021-06-24 19:36:17 +05:30
Afshan	7fd44907ba	feat: fetching of qty as per received qty from PR to PI (#26184)	2021-06-24 14:26:36 +05:30
Rucha Mahabal	e81775d6f7	chore: remove unused import	2021-06-24 13:18:49 +05:30
Rucha Mahabal	357657fa73	chore: create a separate controller file for EmployeeBoardingController	2021-06-24 13:00:50 +05:30
Afshan	53fefd7513	feat: fetching of qty as per received qty from PR to PI (#25837)	2021-06-24 10:09:02 +05:30
Anurag Mishra	11c155e6ce	feat: Employee Grievance (#25705) (#26162) ... * feat: Employee Grievance * feat: link to desk and automatic unsuspend * test: Employee Grievance * fix: Sider and Translation * fix: sider * fix: formatting * feat: changes requested * feat: Employee Grievance * feat: link to desk and automatic unsuspend * test: Employee Grievance * fix: Sider and Translation * fix: sider * fix: formatting * feat: changes requested * fix: patch test and sider issue * fix: make Employee Responsible non-mandatory since there cannot be an employee responsible for all sorts of grievances - show pay cut and suspension buttons only if Employee Resposible is set - some label changes * feat: added subject field for more context - set title for documents - added list view settings - refactor suspend and unsuspend functions - add submit and cancel perms for system and hr managers - fix tests * fix: sider issues * fix: removed suspension and paycut * fix:sider * fix: test * fix: test * fix: resolved Conflicts * fix: sider * fix: remove debugging print statements * fix: validation message * fix: unnecessary comma Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com> Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-06-23 12:13:32 +05:30
Anurag Mishra	fc98abece9	feat: Employee Grievance (#25705) ... * feat: Employee Grievance * feat: link to desk and automatic unsuspend * test: Employee Grievance * fix: Sider and Translation * fix: sider * fix: formatting * feat: changes requested * feat: Employee Grievance * feat: link to desk and automatic unsuspend * test: Employee Grievance * fix: Sider and Translation * fix: sider * fix: formatting * feat: changes requested * fix: patch test and sider issue * fix: make Employee Responsible non-mandatory since there cannot be an employee responsible for all sorts of grievances - show pay cut and suspension buttons only if Employee Resposible is set - some label changes * feat: added subject field for more context - set title for documents - added list view settings - refactor suspend and unsuspend functions - add submit and cancel perms for system and hr managers - fix tests * fix: sider issues * fix: removed suspension and paycut * fix:sider * fix: test * fix: test * fix: resolved Conflicts * fix: sider * fix: remove debugging print statements * fix: validation message * fix: unnecessary comma Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-06-23 11:21:38 +05:30
Subin Tom	889140fd8c	fix: sql syntax error in get_project_name method (#26147)	2021-06-22 16:26:19 +05:30
Subin Tom	943b46a759	fix: sql syntax error in get_project_name method (#26145)	2021-06-22 14:26:36 +05:30
Marica	703c30f5f8	fix: Consistent alert indicators	2021-06-22 11:20:17 +05:30
marination	ea0dea46e0	fix: sider and semgrep	2021-06-21 16:51:12 +05:30
marination	49ec0e5ac3	feat: Optionally allow rejected quality inspection on submission	2021-06-21 16:18:35 +05:30
Rohit Waghchaure	01faa9ca11	fix: rate not able to change in purchase order	2021-06-21 14:56:38 +05:30
Rohit Waghchaure	582f187726	fix: rate not able to change in purchase order	2021-06-21 00:59:02 +05:30
Rohit Waghchaure	e5fb23972a	fix: available qty for consumption	2021-06-20 15:28:25 +05:30
Rohit Waghchaure	110e152fa3	fix: purchase invoice qty change not recalculate the consumed qty and added test cases for purchase invoice	2021-06-20 15:28:23 +05:30
Rohit Waghchaure	6bbc8ec3e8	fix: code cleanup and convert public method to private for subcontracting class	2021-06-20 15:27:04 +05:30
Rohit Waghchaure	21b58ef045	fix: semgrep error	2021-06-20 15:27:04 +05:30
Rohit Waghchaure	7b7ceaadd9	feat: subcontract code refactor and enhancement	2021-06-20 15:27:01 +05:30
Rohit Waghchaure	f5db407461	fix: available qty for consumption	2021-06-19 23:19:45 +05:30
Rohit Waghchaure	5cc3f14506	fix: purchase invoice qty change not recalculate the consumed qty and added test cases for purchase invoice	2021-06-19 23:16:23 +05:30
Rohit Waghchaure	ddb0ec261a	fix: code cleanup and convert public method to private for subcontracting class	2021-06-19 23:16:23 +05:30
Rohit Waghchaure	9a2db0b5b1	fix: semgrep error	2021-06-19 23:16:22 +05:30
Rohit Waghchaure	a94b89727c	feat: subcontract code refactor and enhancement	2021-06-19 23:16:22 +05:30
rohitwaghchaure	1c846c5be7	Merge pull request #26114 from rohitwaghchaure/fixed-stock-entry-submission-performance-v13-hotfix ... fix: time out while submitting the stock transactions with more than 50 Items	2021-06-19 18:51:47 +05:30
Rohit Waghchaure	4d81d45a0e	fix: time out while submitting the stock transactions with more than 50 items	2021-06-19 16:15:08 +05:30
Rohit Waghchaure	8520edc952	fix: time out while submitting the stock transactions with more than 50 items	2021-06-19 00:55:35 +05:30
Ankush	584fe32900	fix: escaped warehouse value for sql query (bp #26049) ... Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>	2021-06-18 14:47:30 +05:30
Nabin Hait	0950481253	fix: merge conflict	2021-06-15 20:18:06 +05:30
Noah Jacob	b5a1491176	fix: escaped warehouse value for sql query (#26049)	2021-06-15 12:44:04 +05:30
Deepesh Garg	bbf6121bb5	fix: Revert unintended changes	2021-06-14 20:09:31 +05:30
Deepesh Garg	5ef9a62917	fix: Add separate function to validate payment entry taxes	2021-06-14 20:09:17 +05:30
Deepesh Garg	302855e160	fix: Auto tax calculations in Payment Entry	2021-06-14 20:09:10 +05:30
Deepesh Garg	4cd0f6ce23	fix: Revert unintended changes	2021-06-14 20:01:04 +05:30
Deepesh Garg	8718013c96	fix: Add separate function to validate payment entry taxes	2021-06-14 14:34:44 +05:30
Deepesh Garg	580346360f	fix: Auto tax calculations in Payment Entry	2021-06-14 11:16:39 +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	f310501d7d	fix: filter type for item query	2021-06-11 10:53:07 +05:30
Nabin Hait	d17217c4e2	Merge pull request #25831 from deepeshgarg007/tds_advance_payment_v13 ... feat: Tax deduction against advance payments	2021-06-10 20:25:30 +05:30
Deepesh Garg	5434dd048b	Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into dynamic_gst_rates	2021-06-10 18:56:39 +05:30
Deepesh Garg	911818a9e2	fix: Add multiple fixes	2021-06-09 22:55:10 +05:30
Deepesh Garg	6f2dacc60c	Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13	2021-06-06 19:31:50 +05:30
Deepesh Garg	18be767f75	fix: Remove invalid test	2021-06-06 13:25:34 +05:30
Deepesh Garg	8a7e283926	feat: Item Taxes based on net rate	2021-06-04 22:53:26 +05:30
rohitwaghchaure	c59371ab0c	fix: filter type for item query (#25942)	2021-06-03 20:02:58 +05:30
Marica	e7d9200e0f	Merge pull request #25221 from Alchez/dev-quality-inspection-accounts ... feat: create Quality Inspections from account and stock documents	2021-06-03 01:39:05 +05:30
Nabin Hait	811f607c85	Merge branch 'version-13' into develop	2021-06-02 22:14:20 +05:30
Nabin Hait	88d94dbf0a	Merge pull request #25915 from rohitwaghchaure/fixed-work-order-no-able-to-select-item ... fix: not able to select the item code in work order	2021-06-02 19:00:34 +05:30
Rohan Bansal	a06ec03efc	test: add test for new QI function	2021-06-02 14:55:31 +05:30
Rohit Waghchaure	5dd92934ae	fix: not able to select the item code in work order	2021-06-02 14:27:24 +05:30
Rohan Bansal	11aff80dea	Merge remote-tracking branch 'upstream/version-13-hotfix' into dev-quality-inspection-accounts	2021-06-02 14:22:32 +05:30
Rohit Waghchaure	721b4130db	fix: not able to select the item code in work order	2021-06-02 14:13:09 +05:30
Nabin Hait	a3d1b6973a	fix: merge conflict	2021-05-31 11:21:33 +05:30
Suraj Shetty	c26d41acf9	chore: Remove unnecessary print statements	2021-05-28 09:09:36 +05:30
Rohan Bansal	1e3a3b27c6	style: semgrep issues	2021-05-26 15:18:10 +05:30
Rohan Bansal	1cdf5a0dba	fix: add requested changes	2021-05-26 14:42:15 +05:30
Rohan Bansal	c5b074269a	Merge remote-tracking branch 'upstream/version-13-hotfix' into dev-quality-inspection-accounts	2021-05-26 14:32:14 +05:30
Ganga Manoj	18cfced032	fix(Material Request): Make status on list and form view the same (#24856)	2021-05-25 19:54:07 +05:30
Deepesh Garg	84f270e732	fix: Remove unwanted commits	2021-05-25 18:03:42 +05:30
Deepesh Garg	c9da1fc568	chore: Test case for adance TDS allocation	2021-05-25 17:37:17 +05:30
Deepesh Garg	a23aaf43f4	fix: Allocate advance taxes only for payment entry	2021-05-25 17:36:06 +05:30
Deepesh Garg	d18dde7757	fix: Add tds in PO and code cleanup	2021-05-25 17:32:28 +05:30
Deepesh Garg	c26de28613	fix: TDS against Purhase Orders	2021-05-25 17:25:13 +05:30
Deepesh Garg	61c5e478af	feat: Tax deduction against advance payments	2021-05-25 17:20:52 +05:30
Ankush Menat	7b4a38c71e	chore: remove print from account controller (#25807) ... This is polluting test output and it's not useful for debugging without context.	2021-05-23 18:49:26 +05:30
rohitwaghchaure	651e934415	Merge pull request #25683 from noahjacob/supplier_item_group_link ... feat: linking supplier with an item group for filtering items	2021-05-21 12:07:53 +05:30
noahjacob	8e34c49ac9	refactor: using get_all instead of get_list	2021-05-19 13:51:36 +05:30
noahjacob	ca2fb47d44	feat: updates item_code filters if item_group is linked to supplier	2021-05-18 15:01:05 +05:30
Nabin Hait	8b2fef11b1	fix: merge conflict	2021-05-17 11:37:14 +05:30
rohitwaghchaure	2aa401826e	fix: validation message of quality inspection in purchase receipt (#25666)	2021-05-14 12:34:50 +05:30
rohitwaghchaure	e9f6c8cdb1	fix: validation message of quality inspection in purchase receipt (#25667)	2021-05-14 12:34:13 +05:30
rohitwaghchaure	958c96ee3f	Merge pull request #25660 from deepeshgarg007/promotional_item_cost_center ... fix: Breaking cost center validation	2021-05-11 18:08:17 +05:30
Deepesh Garg	a60c3081cf	fix: Breaking cost center validation	2021-05-11 16:38:33 +05:30
Ganga Manoj	f2eb8dd1d5	feat: Transaction Deletion Record (#25354) ... Co-authored-by: Saqib <nextchamp.saqib@gmail.com>	2021-05-10 14:02:58 +05:30
Suraj Shetty	80aa8a3149	Merge branch 'develop' of github.com:frappe/erpnext into parallel-distributed-testing	2021-05-08 11:28:27 +05:30
Rucha Mahabal	062d30146f	fix: Include search fields in Project Link field query (#25505) ... * fix: Include search fields in Project Link field query * fix: add project_name to Project search fields	2021-05-07 13:31:14 +05:30
Suraj Shetty	c702408f99	chore: Remove unnecessary print statements	2021-05-06 18:37:45 +05:30
Saqib	92cefd5655	feat(pos): ability to retry on pos closing failure (#25604) ... * feat(pos): ability to retry on pos closing failure * fix: sider issues * fix: sider issues * fix: mark all queued closing entry as failed * feat: add headline message	2021-05-06 17:03:16 +05:30
Saqib	900a8fb21a	feat(pos): ability to retry on pos closing failure (#25595) ... * feat(pos): ability to retry on pos closing failure * fix: sider issues * fix: sider issues * fix: mark all queued closing entry as failed * feat: add headline message	2021-05-06 17:02:47 +05:30
18alantom	2a20a03c28	fix: check for None in item.schedule_date before setting	2021-05-05 11:59:15 +05:30
Saqib	2bde1baa38	fix: remove print statement	2021-04-29 18:12:42 +05:30
Saqib Ansari	3a5ecb7587	fix: test	2021-04-29 18:12:32 +05:30
Saqib Ansari	a91eebf6aa	feat: base payment amount in payment schedule	2021-04-29 18:12:23 +05:30
Saqib	83e3820575	fix: remove print statement	2021-04-29 12:21:56 +05:30
Saqib Ansari	da5b55c4f5	fix: test	2021-04-28 14:55:33 +05:30
Saqib Ansari	3f7ec95af8	Merge branch 'develop' of https://github.com/frappe/erpnext into payment-term-amount-display-currency-fix	2021-04-28 14:45:27 +05:30
Ankush Menat	9178d95cca	fix: can not create item variants (#25433) ... * fix: item_code assigned to function returning None * fix: ignore has_variants and attributes in variant * fix: patch to remove has_variants and attributes * chore: fix whitespace in translation	2021-04-26 15:37:17 +05:30
Deepesh Garg	4c8d15b487	fix: Incorrect GL Entry validation (#25474) ... * fix: Incorrect GL Entry validation * fix: Add validation for party accounts * fix: Scrub labels * fix: Translation	2021-04-26 15:24:34 +05:30
Saqib Ansari	d552fe6778	feat: base payment amount in payment schedule	2021-04-23 14:46:52 +05:30
Deepesh Garg	cb718fce88	feat: Role to allow over billing, delivery, receipt (#24854) ... * feat: Role to allow over billing, delivery, receipt * fix: Typo	2021-04-19 13:25:15 +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
Marica	4e25aa77dd	Merge branch 'develop' into dev-quality-inspection-accounts	2021-04-14 19:06:14 +05:30
rohitwaghchaure	ac6facda3d	Merge pull request #25186 from rohitwaghchaure/fixed-incorrect-batch-selected-in-purchase-rceipt-develop ... fix: incorrect batch picked in subcontracted purchase receipt	2021-04-14 14:35:12 +05:30
Rohan Bansal	7f8b95efe8	fix: move QI logic to stock module	2021-04-14 14:15:45 +05:30
Nabin Hait	2535fe9b1e	fix: Resolved merge conflict	2021-04-14 13:09:50 +05:30
Nabin Hait	f7441c4c0a	Merge branch 'develop' into fixed-incorrect-batch-selected-in-purchase-rceipt-develop	2021-04-14 11:23:00 +05:30
Deepesh Garg	e2dc102bc6	fix: Zero amount completed delivery notes being shown in Sales Invocie get items (#25317)	2021-04-14 11:21:11 +05:30
Deepesh Garg	b67058869a	fix: Round off final tax amount instead of current tax amount (#25188) ... * fix: Round off final tax amount instead of current tax amount * fix: Syntax error * fix: Indentation * fix: Round Off taxes order execution Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-04-14 11:20:27 +05:30
rohitwaghchaure	ce6c3b5b74	fix: incorrect incoming rate for the sales return (#25306)	2021-04-13 20:55:52 +05:30
Nabin Hait	10c61376e3	fix: Backport missing commits to develop branch (#25305)	2021-04-13 15:46:01 +05:30
Deepesh Garg	5f3d7f547c	fix: Item wise tax rate for consolidated POS invoice (#25029) ... * fix: Item wise tax rate for consolidated POS invoice * fix: Do not alter item wise taxes for consolidated invoices * fix: Add test case * fix: Update * fix: Set opening stock for test item * fix: Add valuation rate for opening stock	2021-04-12 10:56:47 +05:30
Rohit Waghchaure	1358443cdb	fix: patch	2021-04-10 10:42:08 +05:30
Deepesh Garg	df9388aa8e	Merge pull request #25086 from deepeshgarg007/advance_amount_precision ... fix: Precision issues while allocating advance amount	2021-04-09 21:39:02 +05:30
Rohan Bansal	a93b514b2f	feat: create Quality Inspections from account and stock documents	2021-04-06 17:20:16 +05:30
Rohit Waghchaure	8b829711fc	fix: incorrect batch picked in subcontracted purchase receipt	2021-04-04 12:43:38 +05:30
Walstan Baptista	37b826b988	fix: correct calculation for discount amount when margin is set (#25179)	2021-04-03 19:48:46 +05:30
Nabin Hait	11eb30d082	fix: merge conflict	2021-04-01 15:03:11 +05:30
Marica	8617c0ab99	Merge pull request #25070 from marination/update-items-bin ... fix: Update Bin via Update Item on Purchase/Sales Order	2021-03-31 22:21:41 +05:30
Anupam Kumar	526497bc43	Merge pull request #25104 from anupamvs/purchase-side-margin-beta ... feat: price margin in buying	2021-03-31 18:38:58 +05:30
Anupam	ad520e08ba	feat: price margin in buying	2021-03-31 18:31:12 +05:30
Marica	1b8d36634f	Merge branch 'develop' into patch-7	2021-03-31 16:04:24 +05:30
Saqib	fb4051bddd	feat: discount configuration on early payments (#25089) ... * feat: discount configuration on early payments Co-authored-by: Nabin Hait <nabinhait@gmail.com> * fix: remove duplicate patch call Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-03-31 15:52:51 +05:30
Saqib	0586b7db79	feat: discount configuration on early payments (#24586) ... Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-03-31 15:03:53 +05:30
Deepesh Garg	f54d596ae1	fix: Precision issues while allocating advance amoount	2021-03-31 14:06:02 +05:30
Sagar Vora	e50324aed7	perf: reduce number of queries for checking if future SL entry exists (#25064)	2021-03-31 12:44:03 +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
marination	a5de6c779b	fix: Cleaned up and fixed validation and bin updation on deletion ... - Created separate smaller functions for validation and bin updation of deleted row - Made sure previous doc (linked doc) was also updated after deletion of row - Tests to check bin updation on add/update/delete - Made reserved qty for subcontrating read only in bin	2021-03-31 02:03:26 +05:30
Andy Zhu	ba3578929e	Update accounts_controller.py ... Updating Bin quantity based on doctype to optimize running efficiency.	2021-03-31 02:03:16 +05:30
Andy Zhu	c0ba6eafd5	fix: Update Items on Purchase Order ... 1. set warehouse using `get_item_warehouse` 2. update "reserved_qty" for sales order	2021-03-31 02:03:10 +05:30
Andy Zhu	a21e347bf1	fix: Update Items on Purchase Order ... If user add rows or remove rows to update items on purchase order, the quantity in bin won't get updated. This fix is not mature yet but to give an tempopary solution for fixing this issue.	2021-03-31 02:03:02 +05:30
marination	0673f558c1	fix: Cleaned up and fixed validation and bin updation on deletion ... - Created separate smaller functions for validation and bin updation of deleted row - Made sure previous doc (linked doc) was also updated after deletion of row - Tests to check bin updation on add/update/delete - Made reserved qty for subcontrating read only in bin	2021-03-31 01:42:18 +05:30
Marica	c5739957de	Merge branch 'develop' into patch-7	2021-03-30 18:07:32 +05:30
Deepesh Garg	6be78db62c	Merge pull request #25052 from deepeshgarg007/gst_rounding_v13_beta ... feat: Normal rounding for GST Taxes	2021-03-30 17:01:45 +05:30
Anupam Kumar	9be11afbde	feat: price margin in buying (#25058)	2021-03-30 12:09:46 +05:30
Deepesh Garg	c2548ddc75	feat: Normal rounding for GST Taxes	2021-03-29 16:42:47 +05:30
rohitwaghchaure	b38ea0cc8b	fix: patch (#25014) ... * fix: patch * fix: pricing_rule test cases	2021-03-28 15:51:32 +05:30
Sagar Vora	868c0bf45b	perf: reduce no of queries for checking if future sl entry exists (#24881)	2021-03-27 16:10:20 +05:30