schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
46,086 Commits 322 Branches 1,581 Tags
30b6321fd5f471f0678552e5f728c4ec5f1bf746
Commit Graph

708 Commits

Author SHA1 Message Date
ruthra kumar
30b6321fd5 fix: error while filtering on name on reconciliation tool 2023-12-14 14:28:20 +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
ruthra kumar
dc804f216d Merge pull request #37402 from frappe/mergify/bp/version-14-hotfix/pr-36879 
feat: Unreconcile Payments (backport #36879)
 2023-10-10 10:39:54 +05:30
ruthra kumar
606c99e57c fix: typo in doctype name and qb 
(cherry picked from commit 9a1588f1cc)
 2023-10-09 06:15:08 +00:00
ruthra kumar
3a670264b2 chore: delete unreoncile doc upon parent doc deletion 
(cherry picked from commit 6bbe47c671)
 2023-10-09 06:15:05 +00:00
ruthra kumar
9422422dcc refactor: remove references using framework 
(cherry picked from commit 42df0d3d67)
 2023-10-09 06:15:04 +00:00
ruthra kumar
37fc82cd11 chore: delete references upon parent deletion 
(cherry picked from commit fbdfb8151c)
 2023-10-09 06:15:04 +00:00
Smit Vora
f7de825e89 chore: add regional support for getting payment entries (#37119) 
chore: add regional support for get payment entries
(cherry picked from commit 3e282bfbce)
 2023-10-02 10:32:40 +00:00
vr-greycube
e483b4a78a fix: Use default Cost Center of the Company for additional discount (#37234) 
fix: Set cost center as default company cost center

When Discount Accounting in enabled in Selling Settings, use Company default Cost Center while making GL entries for additional_discount_account

(cherry picked from commit 4ada5a488e)
 2023-09-27 05:09:46 +00:00
mergify[bot]
1cb8c64c94 fix: after applying coupon code, field in_words not updated (#37133) 
fix: after applying coupon code, field in_words not updated (#37133)

* fix: after applying coupon code, field in_words not updated

* fix: changed the order of the function set_total_in_words

(cherry picked from commit 03f0abf6de)

Co-authored-by: RitvikSardana <65544983+RitvikSardana@users.noreply.github.com>
 2023-09-19 19:44:29 +05:30
ruthra kumar
01eae2b758 refactor: gain/loss should use same posting date as payment 
(cherry picked from commit f7865da4d2)
 2023-09-05 03:00:02 +00:00
ruthra kumar
5523bc5081 chore: resolve merge conflict 2023-09-03 10:28:58 +05:30
ruthra kumar
d24c8b1bbc refactor: use payment's CC for gain/loss if company default is unset 
(cherry picked from commit d6a3b9a5c7)

# Conflicts:
#	erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
 2023-09-03 04:44:16 +00:00
ruthra kumar
9168b3b0e8 fix: deduplicate gain/loss JE creation for journals as payment 
(cherry picked from commit 79c6f0165b)

# Conflicts:
#	erpnext/controllers/accounts_controller.py
 2023-09-03 04:44:13 +00:00
Gursheen Anand
a8b58800bb fix: fetch discount amount for gle in base currency 
(cherry picked from commit 112cfe6dfa)
 2023-09-01 09:42:52 +00:00
mergify[bot]
c07548a612 fix: missing company flag for regional fn (#36791) 
fix: missing company flag for regional fn (#36791)

* fix: missing company flag for regional fn

(cherry picked from commit 9bc5952dd5)

Co-authored-by: Dany Robert <danyrt@wahni.com>
 2023-08-26 19:29:15 +05:30
Shariq Ansari
f186015f58 chore: linter fix 
(cherry picked from commit 21c1141fdb)
 2023-08-17 07:40:10 +00:00
Shariq Ansari
1f76c6972b fix: check tax and charges if it is passed 
(cherry picked from commit 7ec6909159)
 2023-08-17 07:40:10 +00:00
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