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

747 Commits

Author SHA1 Message Date
ruthra kumar
e8d05517c5 chore: resolve conflict 2024-04-16 11:07:39 +05:30
ruthra kumar
50a74ee7fe fix: incorrect exc gain/loss for PE against JE for payable accounts 
(cherry picked from commit 81b574053f)

# Conflicts:
#	erpnext/controllers/accounts_controller.py
 2024-04-16 05:29:49 +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
ruthra kumar
aff71970e5 Merge pull request #40904 from frappe/mergify/bp/version-14-hotfix/pr-40878 
refactor: merge taxes from delivery note to Sales Invoice (backport #40878)
 2024-04-08 16:18:48 +05:30
Smit Vora
0172880fd3 feat: new hook fields_for_group_similar_items to group additional fields for print formats (#40831) 
(cherry picked from commit f7c9e1538b)

# Conflicts:
#	erpnext/hooks.py
 2024-04-08 10:18:15 +00:00
ruthra kumar
22b16a6b0e refactor: merge taxes from delivery note to Sales Invoice 
(cherry picked from commit 550cbbd91c)
 2024-04-08 09:09:34 +00:00
ruthra kumar
0437274c58 chore: resolve conflict 2024-03-15 11:39:54 +05:30
ruthra kumar
b011a68a2a refactor: disallow '0' qty return invoices with stock effect 
(cherry picked from commit 898affbee9)

# Conflicts:
#	erpnext/controllers/accounts_controller.py
 2024-03-15 05:37:22 +00:00
mergify[bot]
fe54590af7 fix: incorrect gross profit on the quotation (backport #40438) (#40441) 
fix: incorrect gross profit on the quotation (#40438)

(cherry picked from commit f4a945aee4)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-03-13 21:55:26 +05:30
Nabin Hait
fa55cc68f8 Merge pull request #40263 from nabinhait/pi-optimization 
perf: Performance optmization for Purchase Invoice submission
 2024-03-13 18:17:41 +05:30
ruthra kumar
5d178d2e24 refactor: pass 'name' to get_link_to_form 2024-03-13 13:16:56 +05:30
Nabin Hait
8d682fa884 perf: Caching in checking allowance for qty and amount 2024-03-13 13:00:10 +05:30
ruthra kumar
92ccef0ebc chore: resolve conflicts 2024-03-13 12:14:33 +05:30
ruthra kumar
ae6d1c14cb chore: better popup message 
(cherry picked from commit 445d2acf50)

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

# Conflicts:
#	erpnext/controllers/accounts_controller.py
 2024-03-13 06:12:43 +00:00
ruthra kumar
c1a0ac655e fix: make use of 'flt' to prevent really low precision exc gain/loss 
(cherry picked from commit 0aa72f841d)
 2024-03-02 10:07:31 +00:00
Gursheen Anand
3d243a7fa5 fix: only check for delinked PLEs 
(cherry picked from commit 146c5b3e16)
 2024-02-23 07:10:03 +00:00
Gursheen Anand
08459cef4a fix: delete PLE containing invoice in against 
(cherry picked from commit c1e1fd8829)
 2024-02-23 07:10:02 +00:00
ruthra kumar
9e9486d5ab refactor: skip popup for POS invoices 
(cherry picked from commit 3634c4c284)
 2024-02-23 00:33:09 +00:00
ruthra kumar
5894bb3bbe refactor: use popup to inform on additional reconciliation step 
(cherry picked from commit 0d260faa00)
 2024-02-19 07:32:19 +05:30
ruthra kumar
33777a4d4c refactor: cancel Cr/Dr JE's on Sales/Purchase return cancel 
(cherry picked from commit 0549535603)
 2024-02-07 15:00:44 +00:00
mergify[bot]
46ac4f4714 fix: remove applied pricing rule on qty change (backport #39688) (#39736) 
fix: remove pricing rule

(cherry picked from commit 7c6a5a0f23)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-02-05 16:09:09 +05:30
ruthra kumar
0884c5ed83 chore: resolve conflicts 2024-01-30 11:05:24 +05:30
ruthra kumar
c5ce4db315 refactor: prevent '{debit/credit}_to' account mismatch 
(cherry picked from commit 6f2fae1b61)

# Conflicts:
#	erpnext/controllers/accounts_controller.py
 2024-01-30 05:31:43 +00:00
ruthra kumar
1966ea15ba refactor: pass orders name in a separate criterion 2024-01-30 05:58:26 +05:30
ruthra kumar
c054316127 chore: fix typo and initialize a list 2024-01-29 17:41:56 +05:30
ruthra kumar
ff0daedd52 refactor: convert sql to query builder on Payments query 2024-01-29 17:09:59 +05:30
ruthra kumar
2c431f394e chore: resolve conflicts 2024-01-24 16:11:14 +05:30
ruthra kumar
d4828f3cf5 refactor: pass dimensions on advance allocation 
(cherry picked from commit cbd443a78a)
 2024-01-23 11:59:30 +00:00
ruthra kumar
a919702319 refactor: pass dimension values to Gain/Loss journal 
(cherry picked from commit c44eb432a5)

# Conflicts:
#	erpnext/accounts/utils.py
 2024-01-23 11:59:29 +00:00
ruthra kumar
dac422a0e1 refactor: pass dimension details to query 
(cherry picked from commit 5dc22e1811)

# Conflicts:
#	erpnext/accounts/utils.py
 2024-01-23 11:59:27 +00:00
ruthra kumar
3d62bce885 refactor: pass dimension filters to query 
(cherry picked from commit ff60ec85b8)

# Conflicts:
#	erpnext/controllers/accounts_controller.py
 2024-01-23 11:59:27 +00:00
barredterra
755576bd78 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/journal_entry/journal_entry.js
 2024-01-11 13:37:32 +00:00
mergify[bot]
c0b598074c fix: Validate account in Sales/Purchase Taxes and Charges Template (#39013) 
fix: Validate account in Sales/Purchase Taxes and Charges Template (#39013)

(cherry picked from commit cd37fd790b)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-12-29 16:15:45 +05:30
Smit Vora
24ae45ce84 fix: fetch item_tax_template values if fields with fetch_from exisit 2023-12-17 14:03:37 +05:30
Deepesh Garg
d593f81a16 fix: Init internal child table values 
(cherry picked from commit 2588970d55)
 2023-12-15 12:45:51 +00:00
ruthra kumar
f6c611d026 Merge pull request #38744 from ruthra-kumar/filter_error_on_reconciliation_tool 
fix: error while filtering on name on reconciliation tool
 2023-12-14 15:10:12 +05:30
ruthra kumar
30b6321fd5 fix: error while filtering on name on reconciliation tool 2023-12-14 14:28:20 +05:30
mergify[bot]
b7fe163de5 fix: SO ordered qty on PO item removal (#38378) 
* fix: SO ordered qty on PO item removal (#38378)

* fix: update ordered_qty for SO when PO items removed

* refactor: use cached value

---------

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

# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.py

* chore: resolve conflicts

---------

Co-authored-by: Gursheen Kaur Anand <40693548+GursheenK@users.noreply.github.com>
 2023-12-04 09:35:51 +05:30
mergify[bot]
b88c7d63de fix: don't update previous doc on rate change (backport #38493) (#38523) 
fix: don't update previous doc on rate change

(cherry picked from commit 68f5dd3e7b)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-12-03 14:02:59 +05:30
Marica
50f3b01eb7 fix: Negative Qty and Rates in SO/PO (#38253) 
* fix: Don't allow negative qty in SO/PO

* fix: Type casting for safe comparisons

* fix: Grammar in error message

* fix: Negative rates should be allowed via Update Items in SO/PO

* fix: Use `non_negative` property in docfield & emove code validation
 2023-11-27 09:06:27 +05:30
ruthra kumar
82fa58d4e3 chore: update new unreconcile doctype name in JS and PY files 
(cherry picked from commit 74f9e34182)
 2023-11-23 05:09:23 +00:00
mergify[bot]
69b569df46 fix: standard submit perm in repost ledger for editable invoices (backport #37826) (#37854) 
fix: standard submit perm in repost ledger for editable invoices (#37826)

* fix: ignore perm while reposting ledger

* fix: use flag in save

* fix: remove unnecessary save

(cherry picked from commit 1b808e1d7c)

Co-authored-by: Gursheen Kaur Anand <40693548+GursheenK@users.noreply.github.com>
 2023-11-02 14:33:33 +05:30
ruthra kumar
515bed8c80 refactor: pass gain loss posting date to controller 
(cherry picked from commit 7e600a6494)
 2023-10-23 15:57:16 +00:00
s-aga-r
5025850258 fix: same Serial No get mapped while creating SO -> DN (#37527) 
* fix: same Serial No get mapped while creating SO -> DN

* test: add test case for DN with repetitive serial item
 2023-10-17 12:20:23 +05:30
ruthra kumar
71cb7d37ee refactor: checkbox to toggle exchange rate inheritence in PO->PI 
(cherry picked from commit 08315522bb)
 2023-10-17 04:16:50 +00:00
ruthra kumar
d37a1811db refactor: add validation for Advances in SI/PI 
(cherry picked from commit 0cdd6435a5)
 2023-10-11 14:34:38 +00:00
ruthra kumar
debfbc4761 refactor: remove references in repost doctypes upon parent doc delet 
(cherry picked from commit ed7f67b1a8)
 2023-10-10 11:01:05 +05:30
Gursheen Anand
677525b2cf refactor: use repost accounting legder 
(cherry picked from commit 7ebf083683)
 2023-10-10 10:58:19 +05:30
Gursheen Anand
79e414cb97 refactor: move reposting logic to common controller 
(cherry picked from commit 68effd93bd)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.py
 2023-10-10 10:58:19 +05:30