schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,912 Commits 322 Branches 1,581 Tags
f9974f9eb068cb389fb582da9ae7bd80c20f8dfe
Commit Graph

279 Commits

Author SHA1 Message Date
Sagar Vora
f884cf8a5e perf: reduce queries during transaction save 
(cherry picked from commit b6b8a06fda)
 2024-11-29 19:17:26 +00:00
mergify[bot]
e8aae5018a fix: return type of get_party_details (backport #43131) (#43135) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
fix: return type of `get_party_details` (#43131)
 2024-09-09 19:26:21 +02:00
Nihantra Patel
690278042d fix: address filter and quotation to for prospect 
(cherry picked from commit 24a68a79df)
 2024-05-09 06:45:52 +00:00
Nihantra Patel
754e193c76 fix: address filter and quotation to for prospect 
(cherry picked from commit fe5b88522e)

# Conflicts:
#	erpnext/selling/doctype/quotation/quotation.js
 2024-05-09 06:45:52 +00:00
Akhil Narang
4d34b1ead7 refactor(treewide): formatting and ruff fixes, + manually enabled F401 
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
 2024-04-10 17:13:31 +05:30
mergify[bot]
b364fe7047 fix: communication_date in party dashboards (backport #40005) (#40020) 
fix: accommodate for changed orderby statement

(cherry picked from commit 87df7ff717)

Co-authored-by: Gursheen Anand <gursheen@frappe.io>
 2024-02-22 16:20:15 +05:30
mergify[bot]
26ae708d6d fix(UX): dont override framework's permission check messages (backport #39118) (#39119) 
fix(UX): dont override framework's permission check messages (#39118)

(cherry picked from commit e84c9f7c51)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2024-01-03 20:32:55 +05:30
Dany Robert
1042d4cfeb fix: exclude invoice_doctypes from party advance 
(cherry picked from commit f34ffc2062)
 2023-12-04 05:31:28 +00:00
Vishakh Desai
883eaee014 fix: Supplier Quotation fields (#37963) 
(cherry picked from commit c2bda2c705)

# Conflicts:
#	erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
 2023-11-20 04:42:39 +00:00
Vishakh Desai
1ccd5e4ff5 fix: pass check permission in render_address 
(cherry picked from commit 45299fe4b3)
 2023-11-18 12:08:24 +00:00
ruthra kumar
4c01128827 refactor: ignore cancelled GLE's while looking for currency 
(cherry picked from commit 8d9b90f3f5)
 2023-10-30 10:43:02 +00:00
mergify[bot]
e1504efd40 fix: Issues related to RFQ and Supplier Quotation on Portal (backport #37565) (#37577) 
* fix: Issues related to RFQ and Supplier Quotation on Portal (#37565)

fix: RFQ and Supplier Quotation for Portal
(cherry picked from commit 2851a41310)

* chore: removed backport changes

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-10-19 13:50:55 +05:30
mergify[bot]
022f85dd08 fix: e-commerce permissions for address (#37554) 
* fix: E-commerce permissions

(cherry picked from commit f4d74990fe)

# Conflicts:
#	erpnext/controllers/selling_controller.py

* chore: conflicts

---------

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-10-18 17:21:46 +05:30
ruthra kumar
928e475824 refactor: use payment ledger to fetch advance amount 
(cherry picked from commit 0dc5e5c430)
 2023-08-21 15:24:11 +00:00
ruthra kumar
296a4d7a12 fix: broken advance field in Accounts Receivable summary rpt 
(cherry picked from commit 896b123fb1)
 2023-08-21 15:24:10 +00:00
Gursheen Anand
a79b30e45f refactor: future payments query 
(cherry picked from commit f5761e7965)
 2023-08-04 12:14:04 +00:00
Gursheen Anand
769d7d7554 fix: AP and AR summary 
(cherry picked from commit e355dea4b5)
 2023-08-04 12:14:03 +00:00
Sagar Vora
73e9b38cda fix(regional): set frappe.flags.company temporarily, where required 
(cherry picked from commit 4205f564a0)
 2023-07-24 14:05:34 +00:00
mergify[bot]
059141df52 refactor: get default contact or address (#35248) 
refactor: get default contact or address (#35248)

* refactor: get_party_shipping_address

* refactor: get_default_contact

* chore: adding docstrings

* fix: keep original order

* fix: use get_all instead of get_list

---------

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
(cherry picked from commit b91bb17779)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2023-06-08 22:04:13 +05:30
Nabin Hait
d82d1597ac feat: ability to create quotation against a prospect 
(cherry picked from commit 47ce6de57d)
 2023-06-06 16:25:11 +00:00
mergify[bot]
11440cca4c fix: Show future payments in accounts receivable summary (#35416) 
fix: Show future payments in accounts receivable summary (#35416)

(cherry picked from commit 3504bf7f62)

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2023-05-29 09:52:48 +05:30
Sagar Vora
789dfd6774 fix: set frappe.flags.company to call regional code accurately 
(cherry picked from commit 17ef3c964f)
 2023-04-20 12:18:20 +00:00
mergify[bot]
a8567b09e6 fix: Tax Category not able to set hence it calculating zero tax for item whoes tax template set (#34525) 
fix: Tax Category not able to set hence it calculating zero tax for item whoes tax template set (#34525)

* fix: Tax Category not able to set hence it calculating zero tax for item whoes tax template set

* fix: minor change added

(cherry picked from commit 7aafc90d58)

Co-authored-by: Vishal Dhayagude <vishdha@users.noreply.github.com>
 2023-03-28 17:20:26 +05:30
mergify[bot]
bf0cbe09b9 fix: set tax category from address before executing get_regional_address_details (#34372) 
fix: set tax category from address before executing `get_regional_address_details` (#34372)

(cherry picked from commit 5c06620f97)

Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2023-03-13 21:15:43 +05:30
developsessions
c8c9c50993 fix: default due_date was wrong calculated on template "_Test Payment Term Template 1" (last day of next month) 
(cherry picked from commit ce8a1086a7)
 2023-02-04 17:05:38 +00:00
mergify[bot]
f124dd3112 fix: GST Category validation broken for pos unregistered customer who dont have address. (#33800) 
fix: GST Category validation broken for pos unregistered customer who dont have address. (#33800)

* fix: GST Category validation is given for pos customer

(cherry picked from commit c5ca8d74c4)

Co-authored-by: Vishal Dhayagude <vishdha@users.noreply.github.com>
 2023-01-26 20:26:50 +05:30
Sagar Vora
5a28ba8537 fix: set billing_address for purchases in get_party_details 
(cherry picked from commit a3625b3817)
 2022-08-08 07:31:44 +00:00
Deepesh Garg
243625898e fix(India): Sales taxes and charges template fetching in quotation 2022-06-10 22:05:58 +05:30
Deepesh Garg
bc34737709 chore: Update test case 2022-05-25 15:42:47 +05:30
Ankush Menat
88e257ff6d fix: column name in party query 2022-04-26 11:47:05 +05:30
Ankush Menat
a90e7e32a4 fix: proper quoting in sql queries 2022-04-26 11:47:05 +05:30
Ankush Menat
494bd9ef78 style: format code with black 2022-03-28 18:52:46 +05:30
Saqib Ansari
e5fb871ef4 fix: Ignore missing customer group while fetching price list 2022-03-10 13:54:43 +05:30
ChillarAnand
9ace7d606c fix: Ignore missing customer group while fetching price list 2022-03-08 08:44:48 +05:30
Deepesh Garg
5a2b571aa9 fix: Validate party account with company 2022-02-18 20:05:49 +05:30
Deepesh Garg
b72cdb4bca fix: Previous document currency getting overriden 
(cherry picked from commit ef782fd35b)
 2022-01-24 15:19:54 +00:00
Deepesh Garg
f12be3001d fix: Taxes and Charges template not getting copied from Purchase Order/Receipt to Invoice 
(cherry picked from commit 6a75e8d283)
 2021-12-03 04:12:42 +00:00
Deepesh Garg
829f92f10a Merge pull request #28363 from deepeshgarg007/default_party_account 
fix: Default party account getting overriden in invoices
 2021-11-12 13:04:21 +05:30
Deepesh Garg
88648570d7 fix: Default party account getting overriden in invoices 2021-11-12 12:39:30 +05:30
rohitwaghchaure
0157da57b5 Merge pull request #28308 from rohitwaghchaure/commision-rate-not-fetch-from-sales-person 
fix: commission rate not fetch from sales person
 2021-11-11 19:11:31 +05:30
Rohit Waghchaure
4d4bfa2333 fix: commision rate not fetch from sales person 2021-11-10 00:00:38 +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
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
694ae81618 fix: remove bare excepts 2021-09-01 15:02:28 +05:30
Afshan
2416b3a1ee Merge branch 'develop' into payment-reconc-party-validation-fix 2021-08-18 16:03:47 +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
072f63b324 Revert "fix: Only fetch default Payment Terms Template if present" 
This reverts commit fb80ca9e06.
 2021-08-09 18:53:14 +05:30
GangaManoj
e247e3a4b2 fix: Only fetch default Payment Terms Template if present 2021-08-09 18:53:14 +05:30
Subin Tom
b8845b9ed9 Fix: Payment Entry party validation issue 2021-07-30 16:30:18 +05:30