nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-14 01:20:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,201 Commits 646 Branches 1,810 Tags
e3de229b82f8a70beb66d44a7f5c209fd9c35382
Commit Graph

1816 Commits

Author SHA1 Message Date
mergify[bot]
835edbe80e fix: Party Name in SOA print when viewed from Customer/Supplier master (#34597) 
fix: Party Name in SOA print when viewed from Customer/Supplier master (#34597)

fix: Party Name in SOA print when viewd from Customer/Supplier master
(cherry picked from commit 50c1172f29)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-03-28 16:48:53 +05:30
mergify[bot]
db01bf5dec fix: unset address and contact on trash (backport #34495) (#34560) 
fix: unset address and contact on trash (#34495)

* fix(Customer): unset address and contact on trash

* fix(Supplier): unset address and contact on trash

---------

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
(cherry picked from commit f7bf1b8a0c)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2023-03-23 12:58:32 +05:30
s-aga-r
09b577a91f feat: consider over_order_allowance while validating sales order qty 
(cherry picked from commit 53701c37b1)
 2023-03-17 04:45:27 +00:00
s-aga-r
932639b4df feat: consider over_order_allowance while validating order qty 
(cherry picked from commit 8bcbc45add)
 2023-03-17 04:45:26 +00:00
s-aga-r
da915f1510 feat: add field Over Order Allowance (%) in Buying Settings 
(cherry picked from commit f5937f46cb)
 2023-03-17 04:45:26 +00:00
rohitwaghchaure
0d6a2aed3e Merge pull request #34242 from frappe/mergify/bp/version-14-hotfix/pr-34235 
feat: adjust purchase receipt valuation rate as per purchase invoice rate (backport #34235)
 2023-02-28 22:11:21 +05:30
Rohit Waghchaure
5fce8e2700 fix: default date in Subcontracting reports 
(cherry picked from commit dfddc4efc3)
 2023-02-28 12:32:13 +00:00
Rohit Waghchaure
5e9f1dfbb3 fix: labels name 
(cherry picked from commit a8445da02a)
 2023-02-28 12:05:58 +00:00
Rohit Waghchaure
3ea1c73c07 test: added test cases 
(cherry picked from commit 8e86553717)
 2023-02-28 12:05:57 +00:00
Rohit Waghchaure
db033c6862 feat: adjust purchase receipt valuation rate as per purchase invoice rate 
(cherry picked from commit eab775ef32)
 2023-02-28 12:05:56 +00:00
s-aga-r
05f7fb8fa1 chore: add field show_pay_button in Buying Settings 
(cherry picked from commit d7ef5ad955)
 2023-02-18 06:51:13 +00:00
barredterra
bb174f931d test: download RFQ PDF 
(cherry picked from commit d5b7f2e49e)
 2023-02-15 04:01:57 +00:00
barredterra
1e2611fb1e refactor: download RFQ PDF 
(cherry picked from commit 8e40c04494)
 2023-02-15 04:01:56 +00:00
barredterra
4f37ba9cfe fix: change parameter name for letter head 
To match changes from https://github.com/frappe/frappe/pull/19627

(cherry picked from commit f7fd30fecf)
 2023-02-15 04:01:56 +00:00
mergify[bot]
52bfb66729 feat: Add filters in Loan Interest Report (#33907) 
* feat: Add filters in Loan Interest Report (#33907)

(cherry picked from commit e478a5d0ce)

* chore: remove flaky tests

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-02-11 11:20:10 +05:30
developsessions
d2836c16a7 style: apply results of lint run 
(cherry picked from commit c8cd351b39)
 2023-02-04 17:05:39 +00:00
developsessions
7228a492ef fix: failed test, convert date time to string 
(cherry picked from commit 9d0096ad9e)
 2023-02-04 17:05:39 +00:00
developsessions
ced9274d1b fix: Add missing 1 required positional argument: 'bill_date' 
(cherry picked from commit be1f941996)
 2023-02-04 17:05:38 +00:00
developsessions
76c4dc8177 style: lint wrong from position 
(cherry picked from commit c80aaad437)
 2023-02-04 17:05:38 +00:00
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
barredterra
68a1615eae feat: add incoterm named place to RFQ 
(cherry picked from commit 7156184933)
 2023-02-01 05:11:00 +00:00
mergify[bot]
f54e8625f6 fix: Currency symbol for tax withholding net total field (#33850) 
* fix: Currency symbol for tax withholding net total field (#33850)
 2023-01-31 09:21:59 +05:30
Rohit Waghchaure
8c12f7f2f2 fix: don't add template item in sales/purchase transaction 
(cherry picked from commit 2c83fff1a1)
 2023-01-19 07:13:03 +00:00
mergify[bot]
120dca44ad chore: subcontracting validations (backport #33621) (#33626) 
* fix: `ZeroDivisionError: float division by zero` in SCR

(cherry picked from commit 434aa594d5)

* chore: add row-index in error msgs

(cherry picked from commit 6878f40d1d)

* chore: update error msgs for Subcontracted PO

(cherry picked from commit a0e2a93f3f)

* fix: validate accepted and rejected qty in SCR Item

(cherry picked from commit f028bd6e69)

* chore: linter

(cherry picked from commit b26e96cdf4)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-01-12 20:31:24 +05:30
mergify[bot]
34df9ab7d5 fix: RFQ emails not sent with pdf attachment (#33604) 
fix: RFQ emails not sent with pdf attachment (#33604)

(cherry picked from commit e0f5ecdad6)

Co-authored-by: Smit Vora <smitvora203@gmail.com>
 2023-01-10 22:19:24 +05:30
mergify[bot]
e995e952b5 fix: Incorrect exchange rate in payment entries (#33481) 
fix: Incorrect exchange rate in payment entries (#33481)

* fix: Incorrect exchange rate in payment entries

* test: Update failing tests

(cherry picked from commit 0ed938a490)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-01-10 22:18:59 +05:30
mergify[bot]
d2e3701b1a fix: Timeout error while saving the purchase invoice (#33577) 
* fix: timeout error in the Purchase Invoice

(cherry picked from commit 7249657d15)

* feat: provision to disable get last purchase rate
fix: set_incoming_rate condition

(cherry picked from commit d1d4671320)

* fix: linters issue

(cherry picked from commit 05df8579cd)

* test: test case to check disable last purchase rate

(cherry picked from commit ec171fc7c1)

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2023-01-10 09:02:15 +05:30
s-aga-r
6e15331fd4 fix: fg_item_qty in non-subcontracted PO 
(cherry picked from commit 6f5824cb21)
 2022-12-28 09:58:19 +00:00
s-aga-r
448fbe5582 fix: shipping_address in PO 
(cherry picked from commit 7e1b6b3c2a)
 2022-12-25 14:10:50 +00:00
Deepesh Garg
a01db8fc38 fix: Payment Request flow fixes from Order to Payment Entry 
(cherry picked from commit dc178984ae)
 2022-12-20 08:16:03 +00:00
barredterra
7ff50b9446 feat: improve visibility of default values 
(cherry picked from commit 8717148d9b)
 2022-12-17 13:55:47 +00:00
barredterra
07cda0aeb5 feat: more control when printing RFQ 
(cherry picked from commit ce9626fead)
 2022-12-17 13:55:47 +00:00
barredterra
bfe57acdbf feat: incoterm named place 
(cherry picked from commit e057e1dfe7)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
 2022-12-15 06:30:37 +00:00
s-aga-r
7c1595e2c2 fix: add company filter in RFQ Items 
(cherry picked from commit ca0485a503)
 2022-11-30 05:07:06 +00:00
Deepesh Garg
f87c3c6157 fix: Tax withholding net total for PI in reports 
(cherry picked from commit 3eb1ed19a1)
 2022-11-29 13:21:16 +00:00
barredterra
88346b17e9 feat: add incoterm to purchasing transactions 
(cherry picked from commit 77105306f2)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
 2022-11-27 15:24:18 +00:00
niralisatapara
ba3643514e feat: item wise tds in purchase order 
(cherry picked from commit b9d0b4e2d3)
 2022-11-23 04:22:45 +00:00
ruthra kumar
48a3b3f6f3 test: fix test case for SO/PO advance amount 
(cherry picked from commit 541cf153f7)
 2022-11-22 08:15:57 +00:00
Vishal
660e3fa081 chore: minor fix 
(cherry picked from commit e5dfd53e6f)
 2022-11-18 07:46:49 +00:00
Vishal
ac3120b6f9 fix: minor change 
(cherry picked from commit ba6189d054)
 2022-11-18 07:46:49 +00:00
Vishal
6ddf27380f fix: test case updated for mr 
(cherry picked from commit 343b414b40)
 2022-11-18 07:46:48 +00:00
Vishal
2a892f5c52 fix: test case added for MR internal Transfer 
(cherry picked from commit 89aabdaaaa)
 2022-11-18 07:46:48 +00:00
s-aga-r
caef140a9b fix: make is_internal_supplier read-only 
(cherry picked from commit 5efbc2cbf8)
 2022-11-17 08:40:41 +00:00
mergify[bot]
4c0b5ceb9e refactor: search queries (backport #33004) (#33007) 
refactor: search queries (#33004)

- guard clauses for readability
- use values or format

(cherry picked from commit 34e4903ed7)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-11-17 13:06:46 +05:30
Nabin Hait
eeaa9329f6 fix(ux): Tab break in Customer and Supplier form 
(cherry picked from commit fb7ee301b5)
 2022-11-10 13:01:14 +00:00
mergify[bot]
f8b7cfa6dd refactor: Remove usage of deprecated methods (backport #32914) (#32915) 
* refactor: Remove usage of deprecated methods (#32914)

Warn: Just used regex to replace all usage.
```regex
s/frappe.db.set(\(.*\),\(.*\),\(.*\))/\1.db_set(\2, \3)/g
```

Required after: https://github.com/frappe/frappe/pull/18815

(cherry picked from commit 7e1742956c)

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

* chore: conflicts

* style: black


Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-11-10 11:09:13 +05:30
Rohit Waghchaure
6989cdf4f2 fix: not able to select customer / supplier 
(cherry picked from commit b0fc568c80)
 2022-11-03 06:25:53 +00:00
ruthra kumar
87dc812a4b test: PO advance paid on payment submission and cancellation 
(cherry picked from commit 1a0a8ac7e2)
 2022-11-02 10:59:46 +00:00
ruthra kumar
388cf5113b test: refactor use @change_settings decorator when possible 
(cherry picked from commit 81d791eea0)
 2022-11-02 10:59:46 +00:00
Deepesh Garg
34bd7837e2 fix: Reset advance paid amount on Oreder cancel and amend 
(cherry picked from commit 92f37ca111)
 2022-10-31 16:09:27 +00:00