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

47725 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rohitwaghchaure
f4ac00595d
Merge pull request #39729 from frappe/mergify/bp/version-15-hotfix/pr-39659 
perf: timeout for auto material request through reorder level (backport #39659)
 2024-02-05 13:20:22 +05:30
rohitwaghchaure
66661d0649
Merge pull request #39732 from frappe/mergify/bp/version-15-hotfix/pr-39626 
perf: memory consumption for the stock balance report (backport #39626)
 2024-02-05 13:17:41 +05:30
rohitwaghchaure
326751c8bd
Merge pull request #39727 from frappe/mergify/bp/version-15-hotfix/pr-39684 
fix: incorrect landed cost voucher amount (backport #39684)
 2024-02-05 13:17:11 +05:30
rohitwaghchaure
5e29aab83b perf: memory consumption for the stock balance report (#39626) 
(cherry picked from commit b70f3de16be169a723842a3a99c046a3809d0768)
 2024-02-05 06:18:52 +00:00
Rohit Waghchaure
1b2831bdfe perf: timeout for auto material request through reorder level 
(cherry picked from commit 951023f434a36ef03f874b3dcbd4f995168b7b5a)
 2024-02-05 06:10:56 +00:00
Rohit Waghchaure
a40864dede fix: incorrect landed cost voucher amount 
(cherry picked from commit d78a1e78148a3702990ae347a2b1c31b580c308e)
 2024-02-05 06:09:51 +00:00
mergify[bot]
3eac436e7b
fix: production plan date filters for orders (backport #39702) (#39720) 
fix: production plan date filters for orders (#39702)

(cherry picked from commit 407045a1dee4d5d1e4f08f0e78871942ded9e709)

Co-authored-by: Gursheen Kaur Anand <40693548+GursheenK@users.noreply.github.com>
 2024-02-05 10:14:42 +05:30
mergify[bot]
5fe40ac085
fix(work order): resolve type error during job card creation (backport #39713) (#39714) 
fix(work order): resolve type error during job card creation (#39713)

fix: type error
(cherry picked from commit c81d597ca510706cf3ca7230f21b1630e7515bf5)

Co-authored-by: Vishnu  VS <Vishnuviswambaran2002@gmail.com>
 2024-02-04 22:59:17 +05:30
mergify[bot]
4ee8cf3907
feat: reference for POS SI payments (#39523) 
feat: reference for POS SI payments (#39523)

* feat: reference field in SI payment

* fix: document link for pos si

* refactor: pos invoice queries

(cherry picked from commit d9a72c1e614a8d103ecb8eb13db26cff18981a52)

Co-authored-by: Gursheen Kaur Anand <40693548+GursheenK@users.noreply.github.com>
 2024-02-04 17:54:56 +05:30
mergify[bot]
d7c7748c03
fix: fetch/change tax template on basis of base_net_rate instead of net_rate (#39448) 
fix: fetch/change tax template on basis of base_net_rate instead of net_rate (#39448)

fix: change tax template on basis of base_net_rate instead of net_rate

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
(cherry picked from commit e9fe10c6f13424630a2bfc7cfef1e1faeebab30d)

Co-authored-by: Divyam Mistry <73271406+divyam-mistry@users.noreply.github.com>
 2024-02-03 09:09:59 +05:30
mergify[bot]
f31070741a
fix: Pricing rule application/removal on qty change (#39084) 
fix: Pricing rule application/removal on qty change

(cherry picked from commit f52d7c7665d4097b19a8bb6c5f99acf38cd8adcf)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2024-02-03 08:49:50 +05:30
Frappe PR Bot
317a74b58c chore(release): Bumped to Version 15.11.1 
## [15.11.1](https://github.com/frappe/erpnext/compare/v15.11.0...v15.11.1) (2024-02-02)

### Bug Fixes

* Percentage handling in queries ([#39692](https://github.com/frappe/erpnext/issues/39692)) ([0405a2b](0405a2b817))
 2024-02-02 15:24:10 +00:00
mergify[bot]
0405a2b817
fix: Percentage handling in queries (#39692) 
fix: Percentage handling in queries (#39692)

fix: Percentage handling in queries (#39692)

* fix: Percentage handling in queries

* test: Account with percent sign

* chore: add test records

(cherry picked from commit 6d87cfeb8d87b6faed8a7238cd8cf97df2acd99d)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
(cherry picked from commit e76f59803cebd7ba19a2d0618dce959dfce263b2)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
 2024-02-02 20:53:03 +05:30
mergify[bot]
e76f59803c
fix: Percentage handling in queries (#39692) 
fix: Percentage handling in queries (#39692)

* fix: Percentage handling in queries

* test: Account with percent sign

* chore: add test records

(cherry picked from commit 6d87cfeb8d87b6faed8a7238cd8cf97df2acd99d)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2024-02-02 20:27:36 +05:30
mergify[bot]
41e46326c0
fix: out of range for valuation_rate column in SE (backport #39687) (#39691) 
fix: out of range for valuation_rate column in SE

(cherry picked from commit 1e15a3cc151d750f6b00a52c4a9a595436e465ba)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-02-02 15:24:45 +05:30
Gursheen Kaur Anand
8574941cb6
Merge pull request #39648 from frappe/mergify/bp/version-15-hotfix/pr-39519 
fix: don't overwrite existing terms in transaction (backport #39519)
 2024-02-01 23:48:18 +05:30
ruthra kumar
4f994cf26c
Merge pull request #39666 from frappe/mergify/bp/version-15-hotfix/pr-39655 
fix: correctly calculate diff amount for included taxes (backport #39655)
 2024-02-01 19:44:57 +05:30
ruthra kumar
bb3591deec
Merge pull request #39680 from frappe/mergify/bp/version-15-hotfix/pr-39674 
refactor: use pop up to inform of possible data issue (backport #39674)
 2024-02-01 17:31:18 +05:30
ruthra kumar
e2d041f51c refactor: use pop up to inform of possible data issue 
and leave a comment in communcation trail as well

(cherry picked from commit 78483e2ee6fdef9e36b63408f6796f0a1e78dac1)
 2024-02-01 11:43:19 +00:00
ruthra kumar
63f306f1b4
Merge pull request #39676 from frappe/mergify/bp/version-15-hotfix/pr-39671 
refactor: move ignore ERR filter from SOA to General Ledger (backport #39671)
 2024-02-01 16:38:33 +05:30
ruthra kumar
72c95d31d1 refactor(test): use party with USD billing currency 
(cherry picked from commit beff566c8267104b97f7e4b80c36715e4eb91832)
 2024-02-01 10:41:39 +00:00
ruthra kumar
1ee15f65a8 test: ignore_err filter out in General Ledger 
(cherry picked from commit affca3a519c626a2c3273a82f00ee1579853b0e1)
 2024-02-01 10:41:39 +00:00
ruthra kumar
0a235584ad refactor: move ignore ERR filters from SOA to General Ledger 
(cherry picked from commit c077eda64e8b57011c42fbf7b4fe41af9ab2bc2f)
 2024-02-01 10:41:39 +00:00
Gursheen Kaur Anand
7f4cd3cd15 fix: correctly calculate diff amount for included taxes (#39655) 
(cherry picked from commit 772f540bef28117c008512ead6558db801d395cd)
 2024-02-01 04:44:40 +00:00
barredterra
ba55d0ede7 chore: resolve conflicts 2024-01-31 13:19:19 +01:00
rohitwaghchaure
c74482a27c
Merge pull request #39658 from frappe/mergify/bp/version-15-hotfix/pr-39643 
fix(portal): show PO pay button if payments installed (backport #39643)
 2024-01-31 17:30:48 +05:30
rohitwaghchaure
510ab769f1
chore: fix conflicts 2024-01-31 15:23:14 +05:30
Gursheen Anand
e9314325cc fix: conditionally display show btn setting 
(cherry picked from commit 0c9572bb489c7b1cc12b38e3308f987dd61f162f)

# Conflicts:
#	erpnext/buying/doctype/buying_settings/buying_settings.json
 2024-01-31 09:16:12 +00:00
Gursheen Anand
cea4ed6f88 fix(portal): show PO pay button if payments installed 
(cherry picked from commit ae7be84d873cee0b0ea35614804a249ea56c05bb)
 2024-01-31 09:16:11 +00:00
mergify[bot]
29eb090528
fix: Exchange rate on MR to PO creation for muticurrency POs (#39646) 
fix: Exchange rate on MR to PO creation for muticurrency POs (#39646)

(cherry picked from commit cfd1666181ffdff8ae79bbbb7863e1b12b3c6090)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2024-01-31 12:49:48 +05:30
mergify[bot]
aebb0c7979
chore: cleanup doctype descriptions (backport #39637) (#39652) 
* chore: cleanup doctype descriptions (#39637)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit 6b8f046fb4cfef201464976f5b4c95dc79f96731)

# Conflicts:
#	erpnext/accounts/doctype/accounts_settings/accounts_settings.json
#	erpnext/accounts/doctype/fiscal_year/fiscal_year.json
#	erpnext/stock/doctype/item_price/item_price.json
#	erpnext/stock/doctype/stock_settings/stock_settings.json

* chore: fix conflicts

---------

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2024-01-31 12:38:37 +05:30
barredterra
dcdd3e8cc4 fix: don't overwrite existing terms in transaction 
(cherry picked from commit 77b044f1a6e7273b21ce5a884429875b10d3bb2e)

# Conflicts:
#	erpnext/public/js/controllers/transaction.js
 2024-01-31 00:14:44 +00:00
Frappe PR Bot
f84f82c7d7 chore(release): Bumped to Version 15.11.0 
# [15.11.0](https://github.com/frappe/erpnext/compare/v15.10.8...v15.11.0) (2024-01-30)

### Bug Fixes

* AttributeError in company transaction deletion ([222005c](222005ca44))
* **Batch:** reload doc after splitting ([a97b8fd](a97b8fd876))
* check page obj before adding menu ([0aa73e3](0aa73e31ce))
* default enable closing stock balance (backport [#39551](https://github.com/frappe/erpnext/issues/39551)) ([#39554](https://github.com/frappe/erpnext/issues/39554)) ([4853ab1](4853ab1fec))
* do not auto-populate item delivery date ([5cdc22a](5cdc22adf3))
* email list for auto reorder material request ([98c5653](98c56535d8))
* enqueue JV submission when more than 100 accounts ([07bcc24](07bcc24e35))
* fetch correct quantity and amount for grouped asset ([3bdd1e9](3bdd1e9514))
* honour currency precision while fetching balance ([e0a3820](e0a38207f6))
* incorrect active serial nos (backport [#39389](https://github.com/frappe/erpnext/issues/39389)) ([#39589](https://github.com/frappe/erpnext/issues/39589)) ([7def475](7def475eb1))
* incorrect amount in the material request item (backport [#39567](https://github.com/frappe/erpnext/issues/39567)) ([#39569](https://github.com/frappe/erpnext/issues/39569)) ([e0c35d6](e0c35d60b4))
* Item Tax template is not working for e-commerce ([2905db1](2905db19e5))
* make SO item code reqd ([171586d](171586db9b))
* not able to edit address through portal ([1f5dbeb](1f5dbebe68))
* not able to save BOM (duplicate key error) (backport [#39620](https://github.com/frappe/erpnext/issues/39620)) ([#39623](https://github.com/frappe/erpnext/issues/39623)) ([53c7055](53c705506b))
* not able to save subcontracting purchase receipt (old flow) (backport [#39590](https://github.com/frappe/erpnext/issues/39590)) ([#39592](https://github.com/frappe/erpnext/issues/39592)) ([63eef68](63eef680d0))
* not able to submit subcontracting pr (old flow) (backport [#39622](https://github.com/frappe/erpnext/issues/39622)) ([#39625](https://github.com/frappe/erpnext/issues/39625)) ([960443d](960443d268))
* Payment Terms Status for Sales Order report should show all payment terms from order not only this comming from template ([b2e0d24](b2e0d24954))
* perf issue while submitting stock entry (backport [#39634](https://github.com/frappe/erpnext/issues/39634)) ([#39642](https://github.com/frappe/erpnext/issues/39642)) ([d785c6c](d785c6ce3e))
* prevent extra transfer against inter transfer transaction (backport [#39213](https://github.com/frappe/erpnext/issues/39213)) ([#39596](https://github.com/frappe/erpnext/issues/39596)) ([6d4ca6a](6d4ca6a1ee))
* qtn tests using delivery date ([6b20a7e](6b20a7eed1))
* return doc obj after submit ([da33079](da33079f12))
* Serial No Ledger permission issue ([f9d1995](f9d1995954))
* skip liability account for internal transfer ([e2d85c5](e2d85c513c))
* type error on company doc ([a7d1368](a7d13686c7))

### Features

* In words in payment entry ([5df2f5d](5df2f5d523))
* New financial views - Growth and margin views for P&L and balance sheet ([#39588](https://github.com/frappe/erpnext/issues/39588)) ([a83f310](a83f3106f3))
* Partly billed status in Purchase Receipt ([#39543](https://github.com/frappe/erpnext/issues/39543)) ([e4230cf](e4230cf6d9))
 2024-01-30 14:14:58 +00:00
rohitwaghchaure
32f77eae5d
Merge pull request #39639 from frappe/version-15-hotfix 
chore: release v15
 2024-01-30 19:42:27 +05:30
mergify[bot]
d785c6ce3e
fix: perf issue while submitting stock entry (backport #39634) (#39642) 
fix: perf issue while submitting stock entry (#39634)

(cherry picked from commit b14886b227730813c83b746f440616508f678392)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-01-30 15:43:50 +05:30
ruthra kumar
bc8ab51f9d
Merge pull request #39633 from frappe/mergify/bp/version-15-hotfix/pr-39559 
fix: prevent Return Invoices(Credit/Debit Note) from using a different account  (backport #39559)
 2024-01-30 11:20:25 +05:30
ruthra kumar
5c9c3bee70 test: debit note account mismatch 
(cherry picked from commit bdca718103a98eba64e69715eaf628dfd9377d5e)
 2024-01-30 05:31:53 +00:00
ruthra kumar
c9ea83591f test: account mismatch validation 
(cherry picked from commit 8bdc76073367d4a912524f16bf098d94340f50c5)
 2024-01-30 05:31:53 +00:00
ruthra kumar
10fcf5af5f refactor: prevent '{debit/credit}_to' account mismatch 
(cherry picked from commit 6f2fae1b6133286ab882e421e69f6a87ecb97d4a)
 2024-01-30 05:31:52 +00:00
mergify[bot]
e4230cf6d9
feat: Partly billed status in Purchase Receipt (#39543) 
feat: Partly billed status in Purchase Receipt (#39543)

(cherry picked from commit a673220feb91419f7d9949926fa4b3dd67d63682)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2024-01-29 22:41:09 +05:30
mergify[bot]
53c705506b
fix: not able to save BOM (duplicate key error) (backport #39620) (#39623) 
fix: not able to save BOM (duplicate key error) (#39620)

(cherry picked from commit 4e182b89ce66db9bfb97c332c0132c12e6a83b57)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-01-29 21:22:34 +05:30
mergify[bot]
960443d268
fix: not able to submit subcontracting pr (old flow) (backport #39622) (#39625) 
fix: not able to submit subcontracting pr (old flow) (#39622)

(cherry picked from commit 5cf47ae5f991218ed74efeb2cce7f00a54475e6b)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-01-29 21:22:21 +05:30
Gursheen Kaur Anand
f71af209c0
Merge pull request #39618 from frappe/mergify/bp/version-15-hotfix/pr-39616 
fix(minor): do not auto-populate item delivery date from qtn (backport #39616)
 2024-01-29 16:53:39 +05:30
Gursheen Anand
6b20a7eed1 fix: qtn tests using delivery date 
(cherry picked from commit 079cd30b9c80739f6beec910b838b62f077e236b)
 2024-01-29 10:22:01 +00:00
Gursheen Anand
5cdc22adf3 fix: do not auto-populate item delivery date 
(cherry picked from commit 49cb11c1f357bd73afb0b150a502a418d5560067)
 2024-01-29 10:22:00 +00:00
mergify[bot]
9e36ab7de7
fix amount not updated when change rate in material request (backport #39606) (#39615) 
fix amount not updated when change rate in material request (#39606)

* fix amount not updated when change rate in material request

* make code consistent

(cherry picked from commit efade9b9aee13c4702c69841cdb6766f305d5b30)

Co-authored-by: Jeffry Suryadharma <41689493+jeffrysurya@users.noreply.github.com>
 2024-01-29 13:36:27 +05:30
Gursheen Kaur Anand
daafe45dd4
Merge pull request #39612 from frappe/mergify/bp/version-15-hotfix/pr-39562 
fix: enqueue JV submission when > 100 accounts (backport #39562)
 2024-01-29 11:55:58 +05:30
Gursheen Kaur Anand
706d1111ad
Merge pull request #39610 from frappe/mergify/bp/version-15-hotfix/pr-39598 
fix(minor): type error in financial statements for dashboard (backport #39598)
 2024-01-29 11:42:17 +05:30
Gursheen Anand
da33079f12 fix: return doc obj after submit 
(cherry picked from commit fc677811b7d896879d9c2537b0527635a8ff3855)
 2024-01-29 06:10:03 +00:00
Gursheen Anand
07bcc24e35 fix: enqueue JV submission when more than 100 accounts 
(cherry picked from commit 53b44ccf2907ee15ca4dd6291400272e7cc2acf3)
 2024-01-29 06:10:02 +00:00