Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: pos based on account settings #2647

Merged
merged 8 commits into from
Oct 18, 2024
Merged

fix: pos based on account settings #2647

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
27d6e43
fix: pos based on account settings
Sanket322 Sep 30, 2024
16c54e6
fix: changes as per review
Sanket322 Oct 11, 2024
11e5b8b
fix: merge develop into pos_based_on_account_settings
Oct 16, 2024
92f4608
fix: resolve test case
Oct 17, 2024
ef52fb2
refactor: better variables and structure of pos
vorasmit Oct 18, 2024
ddfc99b
fix: update property setters for accounts settings and it's patch to …
vorasmit Oct 18, 2024
931b00d
test: allow place of supply based on shipping address
vorasmit Oct 18, 2024
6e20565
fix: pos bases of shipping address is only relevant for sales doctypes
vorasmit Oct 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions india_compliance/gst_india/overrides/transaction.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,11 +823,16 @@ def get_gst_details(party_details, doctype, company, *, update_place_of_supply=F
is_sales_transaction = doctype in SALES_DOCTYPES or doctype == "Payment Entry"
party_details = frappe.parse_json(party_details)
gst_details = frappe._dict()
address = frappe.db.get_single_value(
"Accounts Settings", "determine_address_tax_category_from"
)

# Party/Address Defaults
if is_sales_transaction:
company_gstin_field = "company_gstin"
party_gstin_field = "billing_address_gstin"
party_gstin_field = (
"billing_address_gstin" if address == "Billing Address" else "company_gstin"
)
party_address_field = "customer_address"
gst_category_field = "gst_category"

Expand Down Expand Up @@ -1493,13 +1498,24 @@ def validate_transaction(doc, method=None):

validate_overseas_gst_category(doc)

address = frappe.db.get_single_value(
Sanket322 marked this conversation as resolved.
Show resolved Hide resolved
"Accounts Settings", "determine_address_tax_category_from"
)
if is_sales_transaction := doc.doctype in SALES_DOCTYPES:
validate_hsn_codes(doc)
validate_sales_reverse_charge(doc)
gstin = doc.billing_address_gstin
gstin = (
doc.billing_address_gstin
if address == "Billing Address"
else doc.company_gstin
)
elif doc.doctype == "Payment Entry":
is_sales_transaction = True
gstin = doc.billing_address_gstin
gstin = (
doc.billing_address_gstin
if address == "Billing Address"
else doc.company_gstin
)
else:
gstin = doc.supplier_gstin

Expand Down
9 changes: 8 additions & 1 deletion india_compliance/gst_india/utils/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,14 @@ def get_place_of_supply(party_details, doctype):
if gst_state_number and gst_state:
return f"{gst_state_number}-{gst_state}"

party_gstin = party_details.billing_address_gstin or party_details.company_gstin
address = frappe.db.get_single_value(
"Accounts Settings", "determine_address_tax_category_from"
)
party_gstin = (
party_details.billing_address_gstin
if address == "Billing Address"
else party_details.company_gstin
)

elif doctype == "Stock Entry":
party_gstin = party_details.bill_to_gstin or party_details.bill_from_gstin
Expand Down
Loading