nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-23 12:06:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,119 Commits 605 Branches 1,802 Tags
3a3a0a83b751a02eb020f60cbd92225e676b1bd4
Commit Graph

1775 Commits

Author SHA1 Message Date
mergify[bot]
47befa697d fix: incorrect status being set in Invoices (backport #28019) (#28030) 
* fix: incorrect status being set in Invoices (#28019)

Co-authored-by: Pruthvi Patel <pruthvipatel145@gmail.com>
(cherry picked from commit 8d9d0987fe)

* fix: merge conflict

Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2021-10-20 19:24:19 +05:30
Marica
0fcb3cd918 fix: Use strip instead of lstrip and rstrip 
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
(cherry picked from commit 8cf188d9c0)
 2021-10-18 04:56:10 +00:00
marination
44ab131792 fix: Retain space inside Serial no string while cleaning serial nos 
(cherry picked from commit 41035b0330)
 2021-10-18 04:56:10 +00:00
Deepesh Garg
10b239ec50 perf: Add indexes in stock queries and speed up bin updation #27758 
perf: Add indexes in stock queries and speed up bin updation
(cherry picked from commit 6f107da165)
 2021-10-12 14:46:26 +00:00
Ankush Menat
2cfafede44 fix(ux): use toast instead of popup 2021-10-05 14:27:09 +05:30
Ankush Menat
df1f8fddf6 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.
 2021-10-05 14:21:27 +05:30
Saqib Ansari
2108bf9f73 fix: cost center in exchange gain loss gl entry 
(cherry picked from commit 78ad50efc2)
 2021-09-27 07:36:14 +00:00
Saqib Ansari
af531372da fix: setting of gain/loss if party account is in company currency 
(cherry picked from commit 64efe8bf15)
 2021-09-27 07:36:13 +00:00
Frappe PR Bot
e5a062ceb6 feat: add Partly Paid status in Invoices (#27636) 
(cherry picked from commit c8b9a55e96)

Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2021-09-22 12:17:58 +05:30
mergify[bot]
10cffe81b0 fix: Webform Permission for custom doctype (backport #26232) (#27592) 
* 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

(cherry picked from commit 9aa6f52edd)

# Conflicts:
#	erpnext/hooks.py

* chore: Resolved Conflicts

Co-authored-by: Shariq Ansari <30859809+shariquerik@users.noreply.github.com>
 2021-09-20 20:28:29 +05:30
Ankush Menat
684ca451d3 fix(ux): better error message 
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
(cherry picked from commit 21a955d20b)
 2021-09-20 12:13:37 +00:00
Ankush Menat
8cdd6eacdd refactor: add guard clause in for loop 
Reduce overly indented code/improve readability.

(cherry picked from commit 5e4fbba753)
 2021-09-20 12:13:37 +00:00
Ankush Menat
2dc590c0c0 fix: warn when overbilling checks are skipped. 
(cherry picked from commit 43bf82b58b)
 2021-09-20 12:13:36 +00:00
Ankush Menat
55393d160d perf: extract loop invariant db calls 
(cherry picked from commit 648b2d72a5)
 2021-09-20 12:13:36 +00:00
Frappe PR Bot
7d733af983 feat: link items to supplier / customer (#27479) 
* Merge pull request #27281 from DeeMysterio/party-specific-items

feat: link items to supplier / customer
(cherry picked from commit aa82624f31)

# Conflicts:
#	erpnext/patches.txt

* fix: resolve conflict

Co-authored-by: DeeMysterio <dikshajadhav11.dj@gmail.com>
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-15 17:19:50 +05:30
Frappe PR Bot
8337ec9fe0 test: basic tests for controllers/queries (bp #27422) 
(cherry picked from commit 62fc544280)

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-10 13:09:16 +05:30
Chillar Anand
4b2be2999f chore: Cleanup imports (#27320) 
* chore: Added isort to pre-commit config

* chore: Sort imports with isort

* chore: Remove imports with pycln

* chore: Sort imports with isort

* chore: Fix import issues

* chore: Fix sider issues

* chore: linting

* chore: linting / sorting import

from ecommerce refactor merge

* ci: dont allow unused imports

* chore: sort / clean ecommerce imports

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-09-03 18:57:43 +05:30
Marica
7c09a79dd4 Merge branch 'version-13-hotfix' into e-commerce-refactor 2021-09-02 10:25:14 +05:30
Ankush Menat
9ad5de2e57 fix: remove unused format from query 
doctype is not used in query and parent alone is enough to identify
packed items.
 2021-09-01 20:21:21 +05:30
Anuja Pawar
d81e837667 refactor: payment reconciliation tool (#27284) 2021-09-01 15:20:37 +05:30
skjbulcher
a1e5a64a66 fix: payment terms on Sales Order when Invoice Portion field is empty 2021-08-31 18:24:12 +05:30
marination
06a6fd512a Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into e-commerce-refactor 2021-08-26 16:53:59 +05:30
Marica
57972cab48 Merge branch 'version-13-hotfix' into backport/version-13-hotfix/27086 2021-08-26 15:55:48 +05:30
Frappe PR Bot
c3b1376517 fix: allow to change incoming rate manually in case of stand-alone credit note (#27164) 
* fix: allow to change rate manually in case of stand-alone credit note (#27036)

Co-authored-by: Marica <maricadsouza221197@gmail.com>
(cherry picked from commit fe4540d74d)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json

* fix: resolve conflicts

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-08-26 14:36:42 +05:30
Marica
6636d857f7 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

(cherry picked from commit f4dc9ee2aa)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
 2021-08-26 07:47:13 +00:00
Saqib Ansari
970e5af051 fix: cost center & naming series 2021-08-26 13:04:38 +05:30
Saqib Ansari
fb6af0481c perf: reduce number of queries to get party link 2021-08-26 13:04:31 +05:30
Saqib Ansari
2cb8cc525c feat: auto create advance entry on invoice submission 2021-08-26 13:01:21 +05:30
Frappe PR Bot
7ac4916191 feat: unreconcile on cancellation of bank transaction (#27109) (#27137) 2021-08-25 16:59:03 +05:30
Marica
dc6a8863e9 Merge branch 'version-13-hotfix' into e-commerce-refactor 2021-08-25 14:35:06 +05:30
Deepesh Garg
74073ddc85 fix: Ignore due date validations if payment terms are copied from orders/receipts (#27120) 2021-08-24 21:56:49 +05:30
Frappe PR Bot
8474961b79 perf: reduce number of queries to validate selling price (#26225) (#27119) 
* 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>
(cherry picked from commit 7c957d72b3)

Co-authored-by: Pruthvi Patel <pruthvipatel145@gmail.com>
 2021-08-24 21:51:53 +05:30
Frappe PR Bot
c8092b7e7a fix: correct price list rate value in return si (#27105) 2021-08-24 18:41:16 +05:30
Frappe PR Bot
1e3a6a8a98 fix: discard empty rows from update items (#27021) (#27095) 
(cherry picked from commit 6de7b8ea93)

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-08-24 12:20:51 +05:30
marination
280f615ded Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into e-commerce-refactor 2021-08-24 11:48:13 +05:30
Ankush Menat
9bb69e711a chore: whitespace cleanup from codebase 2021-08-19 14:33:03 +05:30
Frappe PR Bot
6a35d580e4 fix: Dimension filter query fix to avoid including disabled dimensions (#26988) (#27006) 
* 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>
(cherry picked from commit 333e44eb47)

Co-authored-by: Subin Tom <36098155+nemesis189@users.noreply.github.com>
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
 2021-08-18 18:46:25 +05:30
Frappe PR Bot
77ad668a6f fix: date_unchanged calculation in "Update Items" (#26992) (#27010) 
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 d8a7abcd02)

Co-authored-by: Türker Tunalı <turkert@hotmail.com>
 2021-08-18 12:32:59 +00:00
Sagar Vora
6e921b1ccc Merge pull request #26976 from resilient-tech/fix-incorrect-modified 
fix: Incorrect `modified` time in documents that inherit from `StatusUpdater`
(cherry picked from commit d932cba38a)
 2021-08-17 07:48:29 +00:00
marination
71b0e0a146 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-08-17 01:55:46 +05:30
Marica
2416634385 Merge branch 'version-13-hotfix' into e-commerce-refactor 2021-08-12 19:03:44 +05:30
Frappe PR Bot
1167a9bf94 fix: unsetting of payment if no pos profile found (#26891) 
* fix: unseting of payment if no pos profile found (#26884)

(cherry picked from commit b614834efe)

# Conflicts:
#	erpnext/public/js/controllers/taxes_and_totals.js

* fix: conflicts

* fix: conflicts

* fix: conflicts

* fix: conflicts

Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
Co-authored-by: Afshan <afshan13k@gmail.com>
 2021-08-10 23:18:23 +05:30
Frappe PR Bot
1a39d1a311 fix: cost center & account validation in Sales/Purchase Taxes and Charges (#26881) 2021-08-10 19:38:39 +05:30
marination
f22b858253 fix: Clean Serial No input on Server Side 2021-08-10 14:35:41 +05:30
Marica
1854581d33 Merge branch 'version-13-hotfix' into e-commerce-refactor 2021-08-10 12:11:31 +05:30
Deepesh Garg
9b561ea839 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into discount_accounting_v13 2021-08-10 10:38:14 +05:30
Deepesh Garg
cd980f5e6b Merge pull request #26723 from GangaManoj/backport-po-payment-terms 
feat: Fetch Payment Terms from linked Sales/Purchase Order
 2021-08-10 10:34:39 +05:30
Frappe PR Bot
0ff9ef673c fix: add parameter for db insert while adding item tax (#26855) (#26858) 
(cherry picked from commit b3bbebd27c)

Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
 2021-08-09 17:58:18 +05:30
marination
d477b99c1d Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into e-commerce-refactor 2021-08-09 13:41:45 +05:30
Deepesh Garg
a27ef14db6 fix: Override template only if setting is enabled 2021-08-07 00:12:57 +05:30