schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
45,234 Commits 322 Branches 1,581 Tags
4c527d6bba1d5980950ff31cafe24b914b9228f2
Commit Graph

681 Commits

Author SHA1 Message Date
ruthra kumar
4c527d6bba chore: add msgprint for exc JE 
(cherry picked from commit acc7322874)
 2023-08-14 04:51:45 +00:00
ruthra kumar
22dbe52586 refactor: convert class method to standalone function 
(cherry picked from commit 1ea1bfebc4)
 2023-08-14 04:51:44 +00:00
ruthra kumar
1999132c28 refactor: split make_exchage_gain_loss_journal into smaller function 
(cherry picked from commit c0b3b069b5)
 2023-08-14 04:51:43 +00:00
ruthra kumar
a9faa92796 chore: type info 
(cherry picked from commit 6628632fbb)
 2023-08-14 04:51:43 +00:00
ruthra kumar
513721c338 refactor: handle diff amount in various names 
(cherry picked from commit f4a65cccc4)
 2023-08-14 04:51:42 +00:00
ruthra kumar
8be312b73e refactor: dr/cr logic for journals as payments 
(cherry picked from commit 0567243772)
 2023-08-14 04:51:42 +00:00
ruthra kumar
7c3fc7eb3b refactor: cancel gain/loss JE on Journal as payment cancellation 
(cherry picked from commit 6e18bb6456)
 2023-08-14 04:51:41 +00:00
ruthra kumar
01953bc0e3 refactor: linkage between journal as payment and gain/loss journal 
(cherry picked from commit f119a1e115)

# Conflicts:
#	erpnext/accounts/doctype/gl_entry/gl_entry.py
 2023-08-14 04:51:41 +00:00
ruthra kumar
075a7dfe2e chore: code cleanup 
(cherry picked from commit cd42b26839)
 2023-08-14 04:51:41 +00:00
ruthra kumar
f6bb6b78db refactor: only post on base currency for exchange gain/loss 
(cherry picked from commit 78bc712756)
 2023-08-14 04:51:40 +00:00
ruthra kumar
e2c35f8c85 refactor(test): assert Exc journal when reconciling Journa to invoic 
(cherry picked from commit 389cadf157)
 2023-08-14 04:51:39 +00:00
ruthra kumar
72e88d22ed chore: remove debugging statements and fixing failing unit tests 
(cherry picked from commit ee3ce82ea8)
 2023-08-14 04:51:39 +00:00
ruthra kumar
220bf24555 refactor: exc booking logic for Journal Entry 
(cherry picked from commit 7b516f8463)
 2023-08-14 04:51:39 +00:00
ruthra kumar
a9da619903 chore: fix logic for purchase invoice and some typos 
(cherry picked from commit 34b5e849a2)
 2023-08-14 04:51:38 +00:00
ruthra kumar
c06a6bfc09 refactor: book exchange gain/loss through journal 
(cherry picked from commit 81cd7873d3)
 2023-08-14 04:51:37 +00:00
mergify[bot]
240d866ef4 fix: Debit credit difference while submitting Sales Invoice (#36523) 
* fix: Debit credit difference while submitting Sales Invoice (#36523)

* fix: Debit credit difference while submitting Sales Invoice

* test(fix): Update gl entry comparison

* test(fix): Update gl entry comparison

(cherry picked from commit 492ea3bcc8)

# Conflicts:
#	erpnext/controllers/accounts_controller.py

* chore: resolve conflicts

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-08-09 00:04:47 +05:30
mergify[bot]
0e87c86aab fix: payment allocation in invoice payment schedule (#36440) 
* fix: payment allocation in invoice payment schedule (#36440)

* fix: payment allocation in invoice payment schedule

* test: payment allocation for payment terms

* chore: linting issues

(cherry picked from commit edbefee10c)

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

* chore: resolve conflicts

---------

Co-authored-by: Gursheen Kaur Anand <40693548+GursheenK@users.noreply.github.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-08-09 00:04:08 +05:30
Gursheen Anand
479cab0336 fix: test with None conditon in PE 2023-07-26 09:56:48 +05:30
Gursheen Anand
c3b21a6c30 chore: linting issues 2023-07-25 17:04:03 +05:30
Gursheen Anand
c9daa85985 fix: cost center filter for fetching payments 2023-07-25 16:50:46 +05:30
Sagar Vora
73e9b38cda fix(regional): set frappe.flags.company temporarily, where required 
(cherry picked from commit 4205f564a0)
 2023-07-24 14:05:34 +00:00
mergify[bot]
f39ae9dbb1 fix: make showing taxes as table in print configurable (backport #35672) (#35678) 
* fix: make showing taxes as table in print configurable (#35672)

(cherry picked from commit 491a50a027)

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

* chore: fix conflict

---------

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-06-13 20:44:05 +05:30
Smit Vora
57b502b9de fix(regional): allow regional override for updating gl_dict (#35550) 
(cherry picked from commit b1ef19a0cd)
 2023-06-05 08:27:44 +00:00
mergify[bot]
fa9fa97e05 fix: unable to create partial invoice with auto fetch terms enabled (#35285) 
fix: unable to create partial invoice with auto fetch terms enabled (#35285)

fix: fetch so/po terms if auto fetch is enabled
(cherry picked from commit 0da6c1688b)

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
 2023-05-16 18:59:12 +05:30
Rohit Waghchaure
6d121b8107 fix: inventory dimension for inter company transfer return use case 
(cherry picked from commit 38aaba5720)
 2023-05-13 08:57:03 +00:00
mergify[bot]
693007adfe fix: Common party JV cost center (#35008) 
fix: Common party JV cost center (#35008)

(cherry picked from commit f88431a79a)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-04-25 21:16:59 +05:30
mergify[bot]
5045ad6be6 fix: Unable to allocate advance against invoice (#35007) 
fix: Unable to allocate advance against invoice (#35007)

(cherry picked from commit f7b50f2ade)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-04-25 20:04:47 +05:30
Rohit Waghchaure
a5823547d3 fix: validation for internal transfer entry 
(cherry picked from commit 19911b48fd)
 2023-04-21 12:16:43 +00:00
mergify[bot]
7461239218 fix: Advance payment against payment terms (#34872) 
* fix: Advance payment against payment terms (#34872)

(cherry picked from commit 5c75894065)

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

* chore: resolve conflicts

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-04-17 15:54:54 +05:30
mergify[bot]
c11aebaaae fix: Don't use stale item details (#34847) 
fix: Don't use stale item details (#34847)

(cherry picked from commit a7051cb9b5)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-04-14 11:26:33 +05:30
mergify[bot]
05d24e3665 feat: Auto allocate advance payments only against orders (#34727) 
* feat: Auto allocate advance payments only against orders (#34727)

feat: Auto allocate advance payments only againt orders
(cherry picked from commit fd3fb64aa3)

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

* chore: Resolve conflicts

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-04-05 13:00:40 +05:30
mergify[bot]
5677f25215 fix: Multiple issues in purchase invoice submission (#34600) 
fix: Multiple issues in purchase invoice submission (#34600)

* fix: Multiple issues in purchase invoice submission

* fix: Base grand total calculation

* chore: Calculate base grand total separately only in multi currency docs

* fix: Add gl entry for round off

(cherry picked from commit 4c61ee30bb)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-04-02 12:56:58 +05:30
mergify[bot]
9890cce680 fix: ignore repost payment ledger on basic documents cancellation (#34054) 
fix: ignore repost payment ledger on basic documents cancellation (#34054)

fix: ignore repost payment ledger on cancel/delete of Inv/Pay/JE's

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

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
 2023-02-19 20:50:37 +05:30
mergify[bot]
35fbd67a93 fix: Return against internal purchase invoice (backport #33635) (#33658) 
fix: Return against internal purchase invoice (#33635)

(cherry picked from commit 906ad10d16)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-01-16 10:03:12 +05:30
mergify[bot]
ba5a149a6b fix: Conversion factor error for invoices without item code (petty expenses) (#32714) 
fix: Conversion factor error for invoices without item code (petty expenses) (#32714)

* fix: Set default uom conversion factor to 1 for invoices

* chore: set default conversion_factor as 1

* chore: remove print statements

(cherry picked from commit 617518389a)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2022-12-30 16:00:45 +05:30
Deepesh Garg
c726c16702 fix: Reapply pricing rule on qty change 
(cherry picked from commit b741ae143c)
 2022-12-08 13:12:30 +00:00
Deepesh Garg
9b40b7f240 fix: Due date for month end payment term 
(cherry picked from commit bfb81ef56f)
 2022-12-01 12:46:55 +00:00
Deepesh Garg
5abcb478d0 chore: Update condition 
(cherry picked from commit 6a47fb6c9e)
 2022-11-29 03:59:09 +00:00
Deepesh Garg
2aada1a0d9 fix: Auto repeat date validations 
(cherry picked from commit fa15221455)
 2022-11-29 03:59:09 +00:00
ruthra kumar
14235f24b2 fix: update advace paid in SO/PO in account currency 
(cherry picked from commit bf76b85dfd)
 2022-11-22 08:15:56 +00:00
Daizy Modi
34ca17ab11 perf: use get_cached_value instead of db.get_value in controllers (#32776) 
(cherry picked from commit 4efc947f14)
 2022-11-07 03:52:39 +00:00
Deepesh Garg
6838e5ea3b fix: Disable tax included prices for internal transfers (#32794) 
* fix: Disable tax-included prices for internal transfers

(cherry picked from commit 8d30ebb12b)
 2022-11-05 15:22:07 +00:00
Deepesh Garg
b7763d953a fix: Auto advance allocation against partial invoices 
(cherry picked from commit 181df2fe63)
 2022-11-05 10:58:42 +00:00
ruthra kumar
a561432908 fix: update advance paid in SO/PO from Payment Ledger 
(cherry picked from commit 4487065b67)
 2022-11-02 10:59:45 +00:00
anandbaburajan
f5f13c4611 fix: calculate depreciation properly on asset sale entry and scrap entry 
(cherry picked from commit ff5cad1cd6)

# Conflicts:
#	erpnext/assets/doctype/asset/depreciation.py
 2022-09-28 08:59:41 +00:00
Rohit Waghchaure
436b7e3b70 fix: suggestion threshold label and rule was not working for other items with min and max amount 
(cherry picked from commit f5bd3fa952)
 2022-09-17 06:42:22 +00:00
Nabin Hait
cd613c6033 fix: merge conflict 2022-09-13 16:20:42 +05:30
ruthra kumar
ccd0449006 fix: delete linked payment ledger entries no source doc deletion 
(cherry picked from commit 70313df531)
 2022-09-11 06:37:22 +00:00
Rohit Waghchaure
4bac0daf9b fix: internal transfer flow 2022-09-07 14:29:15 +05:30
Deepesh Garg
3afb625ff8 fix: Test cases 
(cherry picked from commit ae3dce0cbd)
 2022-08-23 04:49:57 +00:00