Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
d4fa114
-Added fields for Tax Exclusive rates and amounts
SaiFi0102 Dec 2, 2018
95eff81
Patch to calculate tax exclusive rates and amounts
SaiFi0102 Dec 2, 2018
b9526eb
Added patch to patches.txt
SaiFi0102 Dec 2, 2018
958883f
Added Tax Exclusive Total field
SaiFi0102 Dec 4, 2018
300c8c0
Fixed a server side discount calculation problem
SaiFi0102 Dec 6, 2018
1f9542f
Bug fix
SaiFi0102 Dec 7, 2018
3274ac7
fix: taxes_and_totals.js for offline POS
SaiFi0102 Jan 2, 2019
1d0cf6d
Merge branch 'master' of https://github.com/frappe/erpnext.git into T…
SaiFi0102 Feb 1, 2019
be9f19b
Merge branch 'master' of https://github.com/frappe/erpnext.git into T…
SaiFi0102 Feb 5, 2019
e78bc1f
fix(Taxes and Totals): Server-side discount_percent calculation fix
SaiFi0102 Feb 5, 2019
73cdfdc
test: Test Tax Exclusive fields calculation
SaiFi0102 Feb 5, 2019
9ea6c0c
fix: Server-side discount calculation fix
SaiFi0102 Feb 5, 2019
659d461
fix: Server-side discount_percentage calculation
SaiFi0102 Feb 5, 2019
f420030
test: Debug messages
SaiFi0102 Feb 11, 2019
3bc54dd
fix: Remove setting server-side discount percentage
SaiFi0102 Feb 11, 2019
fc633b1
Merge branch 'develop' of https://github.com/frappe/erpnext.git into …
SaiFi0102 Feb 12, 2019
0586b38
feat: Added tax_amount_before_discount_amount field
SaiFi0102 Feb 12, 2019
b0442ea
Merge branch 'Tax-Exclusive-PL-Rate' of https://saifi0102@github.com/…
SaiFi0102 Feb 13, 2019
fe0cf71
fix: Do not hide Tax Exclusive Total if Net Total is same
SaiFi0102 Feb 13, 2019
1fc2463
Merge branch 'Tax-Exclusive-PL-Rate' of https://saifi0102@github.com/…
SaiFi0102 Feb 13, 2019
96290fb
patch: Update to v12
SaiFi0102 Feb 13, 2019
168cb64
patch: Update set_transaction_tax_exclusive_fields
SaiFi0102 Feb 18, 2019
7ef0a4f
Merge branch 'Tax-Exclusive-PL-Rate' of https://saifi0102@github.com/…
SaiFi0102 Feb 18, 2019
8bf6283
Merge branch 'master' of https://github.com/frappe/erpnext.git into T…
SaiFi0102 Feb 27, 2019
7a92ad1
feat(taxes_and_totals): Total/Amount before Discount and Total Discount
SaiFi0102 Feb 27, 2019
d583d91
fix(Taxes and Charges): total_before_discount_amount to displayed_total
SaiFi0102 Feb 27, 2019
5e97d0a
fix: patch set_transaction_tax_exclusive_fields
SaiFi0102 Feb 27, 2019
81475f7
fix(taxes_and_totals): Rounding errors in Tax Exclusive fields
SaiFi0102 Feb 28, 2019
91da415
fix(taxes_and_totals): Rounding errors in Tax Exclusive fields
SaiFi0102 Feb 28, 2019
e8e39fc
Merge branch 'develop' of https://github.com/frappe/erpnext.git into …
SaiFi0102 Mar 7, 2019
4cbae0e
Merge branch 'Tax-Exclusive-PL-Rate' of https://saifi0102@github.com/…
SaiFi0102 Mar 7, 2019
df547d3
feat(Sales/Purchase Details Report): Party-Transaction-Item tree view
SaiFi0102 Mar 25, 2019
ad6ecbe
feat: Add Sales/Purchase Details Report link in explore links
SaiFi0102 Mar 25, 2019
646b4bf
feat(Sales/Purchase Details Report): Grand Total Column
SaiFi0102 Mar 25, 2019
6ba6324
fix(Item Wise Sales Register): Do not round amounts in get_tax_accounts
SaiFi0102 Mar 25, 2019
5fa0896
fix(taxes_and_totals): Do not round Tax Exclusive rates
SaiFi0102 Mar 25, 2019
d87884a
test(taxes_and_totals): Test amount before discount fields and updates
SaiFi0102 Mar 25, 2019
c2413d0
Merge branch 'Tax-Exclusive-PL-Rate' of https://saifi0102@github.com/…
SaiFi0102 Mar 25, 2019
07a97b1
fix(Sales/Purchase Details Report): Always show name column
SaiFi0102 Mar 27, 2019
67d86a4
fix(Purchase Taxes and Charges): Set base_displayed_total as read-only
SaiFi0102 Apr 3, 2019
55574ef
Merge branch 'Tax-Exclusive-PL-Rate' of https://saifi0102@github.com/…
SaiFi0102 Apr 3, 2019
840660a
feat(Sales Details Report): List view and Filter to show tax columns
SaiFi0102 Apr 6, 2019
21236ae
fix(Sales/Purchase Details): Remove unnecessary columns and use forma…
SaiFi0102 Apr 7, 2019
522ab14
fix(Sales/Purchase Details): Collapse tree onload
SaiFi0102 Apr 8, 2019
d99cf17
feat(Sales/Purchase Details): Use initial_depth 1 instead of collapse…
SaiFi0102 Apr 9, 2019
a0a80bf
Merge branch 'develop' of https://github.com/frappe/erpnext.git into …
SaiFi0102 Apr 24, 2019
fd4b50a
style: linting
SaiFi0102 Apr 24, 2019
e5503f0
fix: Merge problem
SaiFi0102 Apr 24, 2019
f52aad3
style: linting
SaiFi0102 Apr 24, 2019
dfa4de4
test: debug
SaiFi0102 Apr 24, 2019
2961891
fix: attempt to fix test
SaiFi0102 Apr 25, 2019
9fc7f6d
fix: Missed changes from merge conflict
SaiFi0102 Apr 25, 2019
644e973
test: Remove debug message
SaiFi0102 Apr 25, 2019
99eead9
fix(Sales/Purchase Details): Handle the case that tax_rate can be "NA"
SaiFi0102 Apr 26, 2019
8cd1eb5
fix(Sales/Purchase Details): Remove letter head in report json
SaiFi0102 Apr 30, 2019
ea7eb87
feat(Sales/Purchase Details): Dynamic grouping using grouping utility
SaiFi0102 May 23, 2019
f88ebfa
Merge branch 'Sales-Purchase-Details-Report' into Tax-Exclusive-Sales…
SaiFi0102 May 23, 2019
2807240
feat(Sales/Purchase Details): Added more fields and filters to determine
SaiFi0102 May 24, 2019
1bb4cd3
fix(Sales/Purchase Details): Do not group if not necessary
SaiFi0102 May 24, 2019
491e5d0
Merge branch 'Sales-Purchase-Details-Report' into Tax-Exclusive-Sales…
SaiFi0102 May 24, 2019
bac3f60
Merge branch 'Tax-Exclusive-Sales-Purchase-Details-Report' of https:/…
SaiFi0102 May 24, 2019
4eb9316
fix(Purchase Details): Update filters
SaiFi0102 May 24, 2019
1e6efeb
Merge branch 'Tax-Exclusive-Sales-Purchase-Details-Report' of https:/…
SaiFi0102 May 24, 2019
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
404 changes: 403 additions & 1 deletion erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"allow_copy": 0,
"allow_events_in_timeline": 0,
"allow_guest_to_view": 0,
"allow_import": 0,
"allow_rename": 0,
Expand All @@ -21,6 +22,7 @@
"collapsible": 0,
"columns": 0,
"default": "Total",
"fetch_if_empty": 0,
"fieldname": "category",
"fieldtype": "Select",
"hidden": 0,
Expand Down Expand Up @@ -56,6 +58,7 @@
"collapsible": 0,
"columns": 0,
"default": "Add",
"fetch_if_empty": 0,
"fieldname": "add_deduct_tax",
"fieldtype": "Select",
"hidden": 0,
Expand Down Expand Up @@ -90,6 +93,7 @@
"bold": 0,
"collapsible": 0,
"columns": 2,
"fetch_if_empty": 0,
"fieldname": "charge_type",
"fieldtype": "Select",
"hidden": 0,
Expand Down Expand Up @@ -125,6 +129,7 @@
"collapsible": 0,
"columns": 0,
"depends_on": "eval:[\"On Previous Row Amount\", \"On Previous Row Total\"].indexOf(doc.charge_type)!==-1",
"fetch_if_empty": 0,
"fieldname": "row_id",
"fieldtype": "Data",
"hidden": 0,
Expand Down Expand Up @@ -159,6 +164,7 @@
"collapsible": 0,
"columns": 0,
"description": "If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",
"fetch_if_empty": 0,
"fieldname": "included_in_print_rate",
"fieldtype": "Check",
"hidden": 0,
Expand Down Expand Up @@ -191,6 +197,7 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
"fetch_if_empty": 0,
"fieldname": "col_break1",
"fieldtype": "Column Break",
"hidden": 0,
Expand Down Expand Up @@ -221,6 +228,7 @@
"bold": 0,
"collapsible": 0,
"columns": 2,
"fetch_if_empty": 0,
"fieldname": "account_head",
"fieldtype": "Link",
"hidden": 0,
Expand Down Expand Up @@ -256,6 +264,7 @@
"collapsible": 0,
"columns": 0,
"default": ":Company",
"fetch_if_empty": 0,
"fieldname": "cost_center",
"fieldtype": "Link",
"hidden": 0,
Expand Down Expand Up @@ -290,6 +299,7 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
"fetch_if_empty": 0,
"fieldname": "description",
"fieldtype": "Small Text",
"hidden": 0,
Expand Down Expand Up @@ -325,6 +335,7 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
"fetch_if_empty": 0,
"fieldname": "section_break_10",
"fieldtype": "Section Break",
"hidden": 0,
Expand Down Expand Up @@ -356,6 +367,7 @@
"bold": 0,
"collapsible": 0,
"columns": 2,
"fetch_if_empty": 0,
"fieldname": "rate",
"fieldtype": "Float",
"hidden": 0,
Expand Down Expand Up @@ -389,6 +401,7 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
"fetch_if_empty": 0,
"fieldname": "section_break_9",
"fieldtype": "Section Break",
"hidden": 0,
Expand Down Expand Up @@ -420,6 +433,7 @@
"bold": 0,
"collapsible": 0,
"columns": 2,
"fetch_if_empty": 0,
"fieldname": "tax_amount",
"fieldtype": "Currency",
"hidden": 0,
Expand Down Expand Up @@ -454,6 +468,8 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
"depends_on": "eval:parent.discount_amount",
"fetch_if_empty": 0,
"fieldname": "tax_amount_after_discount_amount",
"fieldtype": "Currency",
"hidden": 0,
Expand Down Expand Up @@ -487,7 +503,8 @@
"bold": 0,
"collapsible": 0,
"columns": 2,
"fieldname": "total",
"fetch_if_empty": 0,
"fieldname": "displayed_total",
"fieldtype": "Currency",
"hidden": 0,
"ignore_user_permissions": 0,
Expand All @@ -499,6 +516,41 @@
"label": "Total",
"length": 0,
"no_copy": 0,
"options": "currency",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"translatable": 0,
"unique": 0
},
{
"allow_bulk_edit": 0,
"allow_in_quick_entry": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"depends_on": "eval:doc.total != doc.displayed_total",
"fetch_if_empty": 0,
"fieldname": "total",
"fieldtype": "Currency",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Net Total",
"length": 0,
"no_copy": 0,
"oldfieldname": "total",
"oldfieldtype": "Currency",
"options": "currency",
Expand All @@ -521,6 +573,7 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
"fetch_if_empty": 0,
"fieldname": "column_break_14",
"fieldtype": "Column Break",
"hidden": 0,
Expand Down Expand Up @@ -552,6 +605,7 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
"fetch_if_empty": 0,
"fieldname": "base_tax_amount",
"fieldtype": "Currency",
"hidden": 0,
Expand Down Expand Up @@ -585,24 +639,26 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "base_total",
"depends_on": "eval:parent.discount_amount",
"fetch_if_empty": 0,
"fieldname": "base_tax_amount_after_discount_amount",
"fieldtype": "Currency",
"hidden": 1,
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Total (Company Currency)",
"label": "Tax Amount After Discount Amount",
"length": 0,
"no_copy": 0,
"options": "Company:company:default_currency",
"permlevel": 0,
"precision": "",
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
"read_only": 1,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
Expand All @@ -618,7 +674,8 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "base_tax_amount_after_discount_amount",
"fetch_if_empty": 0,
"fieldname": "base_displayed_total",
"fieldtype": "Currency",
"hidden": 0,
"ignore_user_permissions": 0,
Expand All @@ -627,13 +684,13 @@
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Tax Amount After Discount Amount",
"label": "Total (Company Currency)",
"length": 0,
"no_copy": 0,
"options": "Company:company:default_currency",
"permlevel": 0,
"precision": "",
"print_hide": 1,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
"remember_last_selected_value": 0,
Expand All @@ -651,6 +708,42 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
"depends_on": "eval:doc.total != doc.displayed_total",
"fetch_if_empty": 0,
"fieldname": "base_total",
"fieldtype": "Currency",
"hidden": 1,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Net Total (Company Currency)",
"length": 0,
"no_copy": 0,
"options": "Company:company:default_currency",
"permlevel": 0,
"precision": "",
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"translatable": 0,
"unique": 0
},
{
"allow_bulk_edit": 0,
"allow_in_quick_entry": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fetch_if_empty": 0,
"fieldname": "item_wise_tax_detail",
"fieldtype": "Code",
"hidden": 1,
Expand Down Expand Up @@ -684,6 +777,7 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
"fetch_if_empty": 0,
"fieldname": "parenttype",
"fieldtype": "Data",
"hidden": 1,
Expand Down Expand Up @@ -721,7 +815,7 @@
"issingle": 0,
"istable": 1,
"max_attachments": 0,
"modified": "2018-09-19 13:48:32.755198",
"modified": "2019-04-03 23:25:34.107840",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Purchase Taxes and Charges",
Expand All @@ -734,4 +828,4 @@
"track_changes": 1,
"track_seen": 0,
"track_views": 0
}
}
Loading