schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
49,301 Commits 322 Branches 1,581 Tags
1121c6663f325502e867eea76a144dfe55c522b3
Commit Graph

795 Commits

Author SHA1 Message Date
ljain112
caa6ca1d0b fix: update dimesions in exchange_gain_loss jv based on base document 
(cherry picked from commit 96df19149d)
 2024-08-26 12:01:28 +00:00
barredterra
dbd466b6b2 chore: resolve conflicts 2024-08-17 02:24:58 +02:00
barredterra
4914481105 fix: translatability of boldened text 
(cherry picked from commit af0ae930ca)

# Conflicts:
#	erpnext/controllers/accounts_controller.py
 2024-08-17 00:21:05 +00:00
ljain112
fd4143e686 fix: dimensions in common party journal entry 
(cherry picked from commit ac629ede79)
 2024-08-07 10:34:09 +00:00
mergify[bot]
9321408154 fix: Discount and taxes in return document should follow the reference document (backport #41911) (#42574) 
fix: Discount and taxes in return document should follow the reference document (#41911)

* fix: Discount and taxes in return document should follow the reference document

* fix: Ignore Pricing rule on debit/credit note if created against PI/SI with test cases

* fix: linter issue

(cherry picked from commit 281198456d)

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2024-08-01 15:45:18 +05:30
ruthra kumar
949d7f4b53 refactor: repost without checking on flag 
(cherry picked from commit 09f429ffba)
 2024-07-24 07:29:11 +00:00
mergify[bot]
d396c18689 perf: Performance optmization for Purchase Invoice submission (backport #40263) (#41946) 
* perf: Optimization for providional gl entries

(cherry picked from commit d7b738ff61)

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

* perf: Performance optimization for validating budget

(cherry picked from commit f204d810bb)

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

* perf: Cached accounting dimensions details

(cherry picked from commit 8cd8b8f885)

* perf: Optimzed code for merging similar gl entries

(cherry picked from commit aa75a60142)

* fix: linter issues

(cherry picked from commit acc0b2faf8)

* perf: Cache accounting dimension filter map

(cherry picked from commit e4bd173875)

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

* fix: minor fixes

(cherry picked from commit 5cd9bf3bda)

* perf: skip unnecessary validation while transaction  cancellation

(cherry picked from commit 05385e4acb)

* perf: refactored handling provisional gl entries for non-stock items

(cherry picked from commit 49c74369a5)

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

* perf: validate expense against budget only if budget exists

(cherry picked from commit c15b2d5490)

* perf: Get bin details only for stock items

(cherry picked from commit 6ff9e6ee84)

# Conflicts:
#	erpnext/stock/get_item_details.py

* fix: added index for price_list column in Item Price

(cherry picked from commit d279e23623)

# Conflicts:
#	erpnext/stock/doctype/item_price/item_price.json

* perf: Caching in checking allowance for qty and amount

(cherry picked from commit 8d682fa884)

* perf: Caching in gl entry

(cherry picked from commit b07769d8d7)

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

* chore: resolve conflicts

* chore: resolve conflict in purchase_invoice.py

---------

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: ruthra kumar <ruthra@erpnext.com>
 2024-06-27 17:32:43 +05:30
ruthra kumar
47071cec5d refactor: for advances uses the party account in references table 
(cherry picked from commit 7dce6e03c7)
 2024-06-22 23:58:09 +00:00
mergify[bot]
0a36139ef4 fix: convert invoice_portion value from str to float (backport #41485) (#41555) 
fix: convert invoice_portion value from str to float (#41485)

(cherry picked from commit a1d489195d)

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2024-05-20 18:36:48 +05:30
Nihantra C. Patel
5c1043fe88 fix: correct ordered qty on SO when removing PO item - v15 (#41342) 2024-05-06 21:36:27 +05:30
ruthra kumar
361d7f1ba5 fix: incorrect exc gain/loss for PE against JE for payable accounts 
(cherry picked from commit 81b574053f)
 2024-04-16 05:29:52 +00:00
Deepesh Garg
3b179bad89 fix: Values in transaciton currency 
(cherry picked from commit a3c9fd6567)
 2024-04-10 15:16:39 +00:00
Akhil Narang
960ef14b7a refactor(treewide): formatting and ruff fixes, + manually enabled F401 
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
 2024-04-10 14:15:58 +05:30
Smit Vora
4ef4466e67 feat: new hook fields_for_group_similar_items to group additional fields for print formats (#40831) 
(cherry picked from commit f7c9e1538b)
 2024-04-08 10:18:24 +00:00
ruthra kumar
e9b87fdd42 refactor: merge taxes from delivery note to Sales Invoice 
(cherry picked from commit 550cbbd91c)
 2024-04-08 09:09:46 +00:00
ruthra kumar
125722ae41 refactor: pass gain loss posting date to controller 
(cherry picked from commit 7e600a6494)

# Conflicts:
#	erpnext/accounts/utils.py
 2024-03-28 10:59:24 +00:00
Rohit Waghchaure
9ec24bcc6c fix: use serial/batch fields for subcontracting receipt and in transit stock entry 
(cherry picked from commit 3423334e4f)
 2024-03-24 10:34:52 +00:00
ruthra kumar
78eb6bd9ea Merge pull request #40466 from frappe/mergify/bp/version-15-hotfix/pr-40461 
refactor: disallow '0' qty return invoices with stock effect (backport #40461)
 2024-03-16 10:05:22 +05:30
Gursheen Anand
8242a9cd46 fix: use in_import flag for checking imported records 
(cherry picked from commit f504f2caf3)
 2024-03-15 07:16:26 +00:00
Gursheen Anand
9cdde50f7c fix: auto-update due date for invoices via data import 
(cherry picked from commit c096133897)
 2024-03-15 07:16:25 +00:00
ruthra kumar
144aec8d6a refactor: disallow '0' qty return invoices with stock effect 
(cherry picked from commit 898affbee9)
 2024-03-15 05:37:36 +00:00
ruthra kumar
bfa78aaf74 fix: advance journal fetching logic in Advances section 
(cherry picked from commit e786a93c2e)
 2024-03-14 10:06:05 +00:00
mergify[bot]
ce2626e911 fix: incorrect gross profit on the quotation (backport #40438) (#40442) 
fix: incorrect gross profit on the quotation (#40438)

(cherry picked from commit f4a945aee4)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-03-13 21:56:20 +05:30
ruthra kumar
70375dfbde refactor: pass 'name' to get_link_to_form 2024-03-13 13:15:07 +05:30
ruthra kumar
1093e0d46f chore: resolve conflicts 2024-03-13 12:17:46 +05:30
ruthra kumar
d87b98d945 chore: better popup message 
(cherry picked from commit 445d2acf50)

# Conflicts:
#	erpnext/controllers/accounts_controller.py
 2024-03-13 06:13:11 +00:00
ruthra kumar
b5f22c39ec chore: update popup message 
(cherry picked from commit adf13a19c4)

# Conflicts:
#	erpnext/controllers/accounts_controller.py
 2024-03-13 06:13:10 +00:00
ruthra kumar
d6a3b179ec refactor(test): make sure party has USD account 
1. Don't reset 'party_account_currency' of SO/PO  upon Payment Entry
cancellation. This happens when there are no payments against a SO/PO

(cherry picked from commit e52c4c8f22)
 2024-03-10 11:09:54 +00:00
ruthra kumar
6a5a941a5a fix: advance paid amount and ledger entries against SO/PO 
(cherry picked from commit d9a0494fc3)

# Conflicts:
#	erpnext/accounts/utils.py
 2024-03-10 11:09:53 +00:00
Gursheen Anand
6230bbc77d fix: test for reposting pi 2024-03-04 00:18:09 +05:30
Gursheen Anand
e20c1acb6e fix: check child rows before update 2024-03-04 00:18:09 +05:30
Gursheen Anand
a512ec7af5 refactor: better abstraction for controller code 2024-03-04 00:16:39 +05:30
ruthra kumar
9057bff786 fix: make use of 'flt' to prevent really low precision exc gain/loss 
(cherry picked from commit 0aa72f841d)
 2024-03-02 10:08:18 +00:00
ruthra kumar
23d7a1fc76 fix: include Debit To/Credit To account while fetching advance 
(cherry picked from commit 3327599c9d)
 2024-02-29 12:22:48 +00:00
Gursheen Anand
a75a69a01e fix: only check for delinked PLEs 
(cherry picked from commit 146c5b3e16)
 2024-02-23 07:10:08 +00:00
Gursheen Anand
190bd45bd7 fix: delete PLE containing invoice in against 
(cherry picked from commit c1e1fd8829)
 2024-02-23 07:10:08 +00:00
ruthra kumar
b40baf5e63 refactor: skip popup for POS invoices 
(cherry picked from commit 3634c4c284)
 2024-02-23 00:33:08 +00:00
ruthra kumar
ce11180793 refactor: use popup to inform on additional reconciliation step 
(cherry picked from commit 0d260faa00)
 2024-02-19 07:31:33 +05:30
mergify[bot]
f08b424972 fix: use correct field name in accounts controller (backport #39884) (#39897) 
fix: use correct field name in accounts controller (#39884)

Changes to get advance payments in SI or PI from JV's

(cherry picked from commit b124081065)

Co-authored-by: Rohit Gunjegaonkar <135806454+rohitg-pbspl@users.noreply.github.com>
 2024-02-14 13:21:55 +05:30
ruthra kumar
5fd4ca56f5 refactor: cancel Cr/Dr JE's on Sales/Purchase return cancel 
(cherry picked from commit 0549535603)
 2024-02-07 15:00:45 +00:00
mergify[bot]
f246684694 fix: remove applied pricing rule on qty change (backport #39688) (#39737) 
fix: remove pricing rule

(cherry picked from commit 7c6a5a0f23)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-02-05 16:09:00 +05:30
ruthra kumar
10fcf5af5f refactor: prevent '{debit/credit}_to' account mismatch 
(cherry picked from commit 6f2fae1b61)
 2024-01-30 05:31:52 +00:00
mergify[bot]
a118417645 refactor: provision to filter on dimensions in reconciliation tool (#39054) 
* refactor: dimensions section in allocation table in reconciliation

(cherry picked from commit 1cde804c77)

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

* refactor: update dimension doctypes in hooks

(cherry picked from commit cfb3d87267)

* refactor: dimensions filter section in payment reconciliation

(cherry picked from commit 20e0acc20a)

* refactor: column break in dimension section

(cherry picked from commit 20576e0f47)

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

* refactor: handle dimension filters

(cherry picked from commit c1fe4bcc64)

* refactor: pass dimension filters to query

(cherry picked from commit ff60ec85b8)

* refactor: set query filters for dimensions

(cherry picked from commit ad8475cb8b)

* refactor: pass dimension details to query

(cherry picked from commit 5dc22e1811)

* refactor: replace sql with query builder for Jourals query

(cherry picked from commit 9c5a79209e)

* refactor: partial change on outstanding invoice popup

(cherry picked from commit 2154502955)

* fix: typo's and parameter changes

(cherry picked from commit 0ec17590ae)

* refactor: Credit Note and its Exc gain/loss JE inherits dimensions

(cherry picked from commit ab939cc6e8)

* refactor: apply dimension filters on cr/dr notes

(cherry picked from commit 188ff8cde7)

* chore: test dimension filter output

(cherry picked from commit e3c44231ab)

* test: dimension inheritance for cr note reconciliation

(cherry picked from commit ba5a7c8cd8)

* refactor: pass dimension values to Gain/Loss journal

(cherry picked from commit c44eb432a5)

# Conflicts:
#	erpnext/accounts/utils.py

* test: dimension inheritance in PE reconciliation

(cherry picked from commit 6148fb024b)

* refactor: pass dimensions on advance allocation

(cherry picked from commit cbd443a78a)

* test: dimension inheritance on adv allocation

(cherry picked from commit fcf4687c52)

* refactor: dynamic dimension filters in pop up

(cherry picked from commit f8bbb0619c)

* refactor: update dimensions, only if provided

(cherry picked from commit ec0f17ca8b)

* refactor: handle dynamic dimension in order query

(cherry picked from commit 7c2cb70387)

* chore: resolve conflicts

---------

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
 2024-01-28 13:50:08 +05:30
Rohit Waghchaure
2905db19e5 fix: Item Tax template is not working for e-commerce 
(cherry picked from commit 7d3240ae3a)
 2024-01-25 06:07:23 +00:00
barredterra
16860c228d fix: unreconcile Bank Transaction on cancel of payment voucher 
(cherry picked from commit 0a95b38166)

# Conflicts:
#	erpnext/accounts/doctype/bank_transaction/bank_transaction.py
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.js
 2024-01-11 13:37:48 +00:00
Deepesh Garg
5dc2e80987 fix: Ignore default payment terms template for opening invoices 
(cherry picked from commit 53bf44d2b8)
 2024-01-10 10:37:45 +00:00
mergify[bot]
3caf462c6b fix: flaky demo test case (backport #39135) (#39198) 
fix: flaky demo test case

(cherry picked from commit 5b1571879c)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2024-01-08 17:44:24 +05:30
mergify[bot]
2db1e1a737 fix: serial / batch barcode scanner (backport #39114) (#39143) 
fix: serial / batch barcode scanner (#39114)

(cherry picked from commit f09e2130a1)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-01-04 16:02:29 +05:30
Deepesh Garg
458064f8a1 feat: Against voucher filter in General Ledger (#39102) 2024-01-03 10:51:34 +05:30
mergify[bot]
e5d73c780b feat: voucher subtype for general ledger (#38822) 
* feat: voucher subtype for general ledger (#38822)

* feat: add voucher subtype column to gle

* feat: add logic to set voucher subtypes

* feat: fetch voucher subtype in ledger report

* fix: order of conditions

(cherry picked from commit 47f7b65058)

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

* chore: resolve conflicts

---------

Co-authored-by: Gursheen Kaur Anand <40693548+GursheenK@users.noreply.github.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2024-01-01 13:30:29 +05:30