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

47578 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ruthra kumar
83bf2c17e0 refactor(test): Forex Credit Note cancellation against Invoice 
(cherry picked from commit 2f676ced5c712823c5737f40230ec8b1994cd2dd)
 2024-02-07 15:00:48 +00:00
ruthra kumar
a805796c0a refactor(test): assert Invoice status as well 
(cherry picked from commit 33efe0d12d85484e551dc9ebebf8840d427ecc67)
 2024-02-07 15:00:47 +00:00
ruthra kumar
0bff065f0b test: Invoice status on Cr/Dr note cancellation 
(cherry picked from commit 31a8c3bdc45f0e32a51e43260db8484e5f17aa75)
 2024-02-07 15:00:46 +00:00
ruthra kumar
5fd4ca56f5 refactor: cancel Cr/Dr JE's on Sales/Purchase return cancel 
(cherry picked from commit 0549535603cae6a7afbd3375c8dd62b517af3c6e)
 2024-02-07 15:00:45 +00:00
Gursheen Kaur Anand
a5ad318a37
Merge pull request #39787 from GursheenK/duplicates-in-tax-category-bpv15 
fix: remove duplicates from tax category map
 2024-02-07 19:22:27 +05:30
mergify[bot]
ba05648741
fix: add permissions to SRE (backport #39780) (#39786) 
fix: add permissions to SRE

(cherry picked from commit 50f54d983d5bec92fab13fbd5226fe4cf2e62dd2)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-02-07 19:03:25 +05:30
Gursheen Anand
3c6114ab72 fix: remove duplicates from tax category map 2024-02-07 18:27:08 +05:30
mergify[bot]
22138867f5
fix: set rate for PO created against BO (backport #39765) (#39767) 
* fix: set rate for PO created against BO

(cherry picked from commit 0e5b4e5f07d15fe04855f1c836c5412d3644035a)

# Conflicts:
#	erpnext/manufacturing/doctype/blanket_order/blanket_order.py

* chore: `conflicts`

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-02-07 10:48:58 +05:30
rohitwaghchaure
789aee4544
Merge pull request #39770 from frappe/mergify/bp/version-15-hotfix/pr-39769 
fix: do not throw validation for canceled SLE (backport #39769)
 2024-02-06 23:46:00 +05:30
Rohit Waghchaure
02f56ee20e fix: do not throw validation for cancelled sle 
(cherry picked from commit 32ccf3524ad973b1bc8c5c7eefa4c79f5d8b4444)
 2024-02-06 17:43:17 +00:00
rohitwaghchaure
c78d4c15d3
Merge pull request #39768 from frappe/mergify/bp/version-15-hotfix/pr-39764 
fix: remove file from the disk after the completion of reposting (backport #39764)
 2024-02-06 22:22:46 +05:30
Rohit Waghchaure
7833138c57 test: test case to check removed attached file 
(cherry picked from commit 76b57a433886c3a38b9c4883db8652aabe8d32d8)
 2024-02-06 15:58:17 +00:00
Rohit Waghchaure
b582e9c42c fix: remove file from the disk after the completion of reposting 
(cherry picked from commit fb330d1b5a8b2620d23c5a899c26ea240966b20c)
 2024-02-06 15:58:16 +00:00
rohitwaghchaure
faf79f4d2a
Merge pull request #39761 from frappe/mergify/bp/version-15-hotfix/pr-39718 
fix: use old serial / batch fields to make serial batch bundle (backport #39718)
 2024-02-06 16:26:33 +05:30
ruthra kumar
47c2bd7335
Merge pull request #39751 from frappe/mergify/bp/version-15-hotfix/pr-39694 
refactor: enforce unique GL Account for each 'Bank Account' (backport #39694)
 2024-02-06 15:48:31 +05:30
Rohit Waghchaure
73618f0605 test: test case to check use serial / batch fields feature 
(cherry picked from commit 01650120d40babc0992a0673498b1eda689fd615)
 2024-02-06 10:18:06 +00:00
Rohit Waghchaure
a08b97e886 test: fixed test cases 
(cherry picked from commit c1e869f040fd4c6ec2e234db71c3f80be50e4524)
 2024-02-06 10:18:05 +00:00
Rohit Waghchaure
282c19e7e1 fix: use old serial / batch fields to make serial batch bundle 
(cherry picked from commit 9fafc83632c4e5c73186bda038b892b7a43d16b8)
 2024-02-06 10:18:05 +00:00
mergify[bot]
53992deb10
fix: show warehouse title field in sales docs (backport #39746) (#39755) 
fix: show warehouse title field in sales docs

(cherry picked from commit ee14faaa39bcb0fb8d813aee7e00eedc8d3a38c1)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-02-06 12:45:37 +05:30
ruthra kumar
4235e08668 refactor(test): make use of test fixtures in Payment Order 
(cherry picked from commit 322cdbaccf0b8697000aae4e56efa659a34fa8e5)
 2024-02-06 04:00:23 +00:00
ruthra kumar
949f4c3790 refactor(test): generate uniq GL acc and Bank acc for each test case 
(cherry picked from commit a9a2ec81de73cde0995c837e12cd5dc79a584841)
 2024-02-06 04:00:23 +00:00
ruthra kumar
11d4382e19 refactor: ensure unique accounts for each Bank Account's 
(cherry picked from commit 2caa2d677c09793f7097c3e76ebb4180a3f2a336)
 2024-02-06 04:00:23 +00:00
mergify[bot]
00e86bf318
fix: update company in serial no doc (backport #39733) (#39747) 
fix: update company in serial no doc

(cherry picked from commit 7a04f0f7bab1bc36774d41b236e8c4421a6305bd)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-02-05 21:55:56 +05:30
rohitwaghchaure
d3c4bd7f5f
Merge pull request #39745 from frappe/mergify/bp/version-15-hotfix/pr-39742 
perf: timeout while submitting the purchase receipt entry (backport #39742)
 2024-02-05 21:17:59 +05:30
rohitwaghchaure
cb15ff1d74
Merge pull request #39743 from frappe/mergify/bp/version-15-hotfix/pr-39730 
perf: Move dimension validation out of GL Entry doctype (backport #39730)
 2024-02-05 21:17:43 +05:30
Rohit Waghchaure
55a8326d06 perf: timeout while submitting the purchase receipt entry 
(cherry picked from commit 1fa62333773a59feb5a0a39d274ebcae362ed286)
 2024-02-05 15:33:04 +00:00
Deepesh Garg
451c288011 perf: Move dimension validation out of GL Entry doctype (#39730) 
(cherry picked from commit b834ed10d6b6faa1f76e1343ca8b347ca393b7dd)
 2024-02-05 15:31:36 +00:00
rohitwaghchaure
7923bd7964
Merge pull request #39741 from frappe/mergify/bp/version-15-hotfix/pr-38362 
feat: visual plant floor (backport #38362)
 2024-02-05 19:42:20 +05:30
Rohit Waghchaure
3bef12cb55 feat: make material request for job card from workstation dashboard 
(cherry picked from commit 6fea9d6dfe50513614e39a7b83ad4db59970e26e)
 2024-02-05 13:50:45 +00:00
Rohit Waghchaure
75bd1e6b65 feat: visual plant floor 
(cherry picked from commit 68c997aa067f342f6e432e9f9c84416a0a4cc1bf)
 2024-02-05 13:50:44 +00:00
mergify[bot]
b126720826
fix: Blanket Order Ordered Quantity (backport #39725) (#39739) 
* fix: disable no-copy for blanket order in PO

(cherry picked from commit 5ce5c352e4ab2293b3f5b5dac9bc1a2a1912e620)

* fix: update BO Ordered Quantity on PO Close/Open

(cherry picked from commit 61ded697a7384d8ef133a42424d8a14763bb6061)

* test: BO on PO Close/Open

(cherry picked from commit 27d6c8b6d52ada292eef5c42506e95bcf933eec8)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-02-05 16:31:20 +05:30
mergify[bot]
f246684694
fix: remove applied pricing rule on qty change (backport #39688) (#39737) 
fix: remove pricing rule

(cherry picked from commit 7c6a5a0f23b948953815870b726c30b0fd076338)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-02-05 16:09:00 +05:30
mergify[bot]
1822325f34
feat: Period-wise closing entries for TB (#39712) 
feat: Period-wise closing entries for TB (#39712)

(cherry picked from commit 6e6c818084ee3fbbb2d44a58acb5c78c9f5b61ac)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2024-02-05 14:34:33 +05:30
mergify[bot]
986273b6d3
feat: copy emails from lead to customer (#38647) 
feat: copy emails from lead to customer

(cherry picked from commit 906ac093e37694c4616cffb961b131ce9002315b)

Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
 2024-02-05 14:05:44 +05:30
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
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