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

236 Commits

Author SHA1 Message Date
David Arnold
f1bd6e492a chore: use local deprecation (#44306) 2024-11-23 22:25:12 +00:00
David Arnold
2e04eeb661 fix: net_amount calculation (#44231) 
fix: tax_item_rate calculation
 2024-11-23 22:10:33 +00:00
David Arnold
9673bf85ec refactor: pass typed arguments to get_item_details methods (#44230) 
* refactor: pass proper types to get_item_details methods

* chore: excempt previous commit from git blame
 2024-11-20 02:31:03 +01:00
David Arnold
af2a622afb fix: partial fix for #44291 (#44229) 
This is only a partial fix and improves the situaton.

A proper fix will need to have items _always_ track their tax-related
account head, namely for item-wise tax templates as well as default
document taxes that are applied "On Net Total", in order to achive
proper assignment of the net_amount.

Currently there is no way to always identify the orignating account head per item.
 2024-11-19 23:15:22 +00:00
David
3732dd1b1f refactor!: store item wise tax details as a more flexible dict 2024-11-12 12:39:04 +01:00
David (aider)
961e7b107d feat: Add net_total to Taxes And Charges doctypes and modify relevant controllers 2024-11-12 12:39:00 +01:00
Raffael Meyer
9872645d3e fix(Quotation): calculate row values for alternative items (#43054) 2024-10-03 20:33:58 +00:00
David
eeb8aba950 fix!: don't round unduly 
BREAKING: If you previously relied on the undue rounding of the tax
amount within the item wise tax detail, revise your code and config.
 2024-09-29 16:56:15 +02:00
David
0bab6f34c1 fix: distributed discounts on si 2024-09-05 11:49:24 +02:00
Nabin Hait
281198456d 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
 2024-08-01 14:51:01 +05:30
Nabin Hait
6810227be0 Merge pull request #40886 from nabinhait/permission-issue 
fix: Ignore permissions while fetching module settings properties
 2024-04-11 10:53:22 +05:30
Nabin Hait
c66dde6318 fix: Show itemised TDS breakup based on Apply TDS checkbox on item level 2024-04-08 20:26:44 +05:30
Nabin Hait
f61faa85a1 fix: Ignore permissions while fetching module settings properties 2024-04-07 11:33:40 +05:30
Akhil Narang
3effaf21ef refactor(treewide): formatting and ruff fixes, + manually enabled F401 
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
 2024-03-27 16:06:04 +05:30
ljain112
5885978fc2 fix: default taxable value for item not found in item list 2024-02-26 18:41:33 +05:30
Divyam Mistry
e9fe10c6f1 fix: fetch/change tax template on basis of base_net_rate instead of net_rate (#39448) 
fix: change tax template on basis of base_net_rate instead of net_rate

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2024-02-01 16:15:43 +05:30
Dany Robert
50d56db0c2 fix: specify precision for net_amount (#39481) 
* fix: specify precision for net_amount

* fix: correct existing test to account for precision

* fix: rounding issue in test cases

* fix: optional grand total manipulation

* fix: use `grand_total_diff` for manipulation

* fix: patch to set default for grand total manipulation

* fix: wrong rounding assertion for USD

* fix: undefined this.frm error

* chore: linters

* fix: `net_amount` percision and method rename

* fix: missing frm reference

* chore: minor cleanups and depr message

* refactor: remove optional adjusting of grand total
 2024-01-29 09:32:44 +05:30
Dany Robert
3a487bd33a fix: wrong round off and rounded total 2023-11-18 13:32:04 +00:00
Dany Robert
6a27cbd61d Merge branch 'frappe:develop' into rounded-row-wise-tax 2023-10-11 12:31:13 +05:30
mergify[bot]
10c666bf69 fix: incorrect status of the returned purchase receipt (backport #37300) (#37380) 
fix: incorrect status of the returned purchase receipt (#37300)

(cherry picked from commit 63f45739e0)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-10-06 14:43:13 +05:30
Dany Robert
9e1b2c9f57 fix: item wise split up rounding 2023-08-24 05:02:14 +00:00
Dany Robert
0ebcc2cf2c fix: round item_wise_tax_detail in taxes 2023-08-23 04:51:09 +00:00
Dany Robert
dfb5b88abb chore: linters 2023-08-23 04:01:00 +00:00
Dany Robert
3ead28906c feat: item(row) wise tax amount rounding 2023-08-22 14:41:07 +00:00
Smit Vora
1b8490dc98 Merge branch 'develop' into fix-tax-breakup-for-diff-tax-rates 2023-07-24 20:20:19 +05:30
Sagar Vora
4205f564a0 fix(regional): set frappe.flags.company temporarily, where required 2023-07-24 18:37:58 +05:30
DaizyModi
6f376cf103 fix: remove unused params 2023-07-24 18:02:42 +05:30
DaizyModi
653117c2a9 test: fix test case for itemised tax breakup 2023-07-21 17:56:33 +05:30
DaizyModi
b84deec601 fix: Correct Tax Breakup for different tax rates for same hsn code 2023-07-21 17:43:27 +05:30
Sagar Vora
17ef3c964f fix: set frappe.flags.company to call regional code accurately 2023-04-20 05:17:30 -07:00
marination
cef7dfd0b4 feat: Dialog to select alternative item before creating Sales order 
- Users can leave the row blank in the dialog if original item is to be used
- Else users can select an alternative item against an original item
- In the document, users must check `Is Alternative Item` if needed and also specify which item it is an altenrative to since there are no documented mappings
 2023-01-26 14:36:25 +05:30
marination
91982d1e4f feat: Filter out alternative item rows in taxes and totals for Quotation 
- Added a Quotation Item field `is_alternative_item`
- Use filtered rows for taxes and totals computation
 2023-01-24 18:03:53 +05:30
Raffael Meyer
67cf7e1728 refactor: use DocStatus (#33594) 2023-01-15 17:34:16 +05:30
Daizy Modi
4efc947f14 perf: use get_cached_value instead of db.get_value in controllers (#32776) 2022-11-07 09:21:03 +05:30
niralisatapara
12456f9850 feat: item wise tds calculation 2022-11-03 10:46:30 +05:30
niralisatapara
2ca0cf6fc4 feat: item wise tds calculation 2022-11-02 12:19:51 +05:30
niralisatapara
4aff2a32ad Merge branch 'develop' of https://github.com/niralisatapara/erpnext into develop 2022-11-02 11:21:02 +05:30
Deepesh Garg
06e8e28531 fix: Mode of payment for returns in POS Sales Invoice 2022-10-31 19:58:46 +05:30
niralisatapara
e758a753f8 Item Wise TDS Calculation 
For calculating Item wise TDS in Purchase Invoice.
 2022-10-03 16:39:35 +05:30
Deepesh Garg
1a61d4e8a8 Merge branch 'develop' into fix-consolidation-precision-error 2022-09-04 13:18:10 +05:30
Deepesh Garg
318da16b99 fix: Rounded total for cash and non trade discount invoices 2022-08-29 14:18:39 +05:30
Deepesh Garg
e9b0c7177f Merge branch 'develop' into fix-consolidation-precision-error 2022-08-25 11:41:20 +05:30
Deepesh Garg
3b15966cc9 fix: Cash and non trade discount calculation 2022-08-21 17:51:05 +05:30
Saqib Ansari
33762dbbac fix(pos): error while consolidating pos invoices 2022-08-10 14:17:28 +05:30
Deepesh Garg
e54ec4b9b6 chore: use get instead of . operator 2022-07-03 11:02:21 +05:30
Deepesh Garg
169ff5a0dd feat: Cash and Non trade discounts in Sales Invoice 2022-06-19 21:18:12 +05:30
Deepesh Garg
631545aa32 fix: Use get instead of dot 
(cherry picked from commit 95298f0400)
 2022-04-06 04:31:13 +00:00
Deepesh Garg
714fc08150 fix: Do not apply shipping rule for POS transactions 
(cherry picked from commit c0ebcfb393)

# Conflicts:
#	erpnext/public/js/controllers/taxes_and_totals.js
 2022-04-06 04:31:13 +00:00
Ankush Menat
3821a97a75 Merge branch 'develop' into mergify/bp/develop/pr-30395 2022-03-28 20:14:19 +05:30
Ankush Menat
494bd9ef78 style: format code with black 2022-03-28 18:52:46 +05:30