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.

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

chore: release v14 #40677

Merged
merged 111 commits into from
Mar 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
111 commits
Select commit Hold shift + click to select a range
f9ab763
fix: achieved targets for sales partners
GursheenK Mar 13, 2024
c3b8c00
test: sales partner targets with invoices
GursheenK Mar 13, 2024
fe3bee4
fix: show correct variance for durations with no vouchers
GursheenK Mar 14, 2024
ee7bd98
fix: pass empty string email content of pos invoice
mmdanny89 Mar 18, 2024
bba1ac5
fix: use Text Editor for rendering tax breakup table
GursheenK Mar 20, 2024
e922ac7
fix: style for tax breakup
ankush Mar 20, 2024
07c9814
refactor: more options for 'status' and move it to top
ruthra-kumar Feb 3, 2024
7280a76
refactor: set status and trigger job on submit
ruthra-kumar Feb 3, 2024
52d22d8
refactor: tasks section and UI niceties
ruthra-kumar Feb 3, 2024
5542985
refactor: UI trigger
ruthra-kumar Feb 3, 2024
c9d7704
refactor: use flags to decide on current stage
ruthra-kumar Feb 3, 2024
e56138d
refactor: reorder flags in Tasks section
ruthra-kumar Feb 4, 2024
b1367e8
refactor: chained callback
ruthra-kumar Feb 4, 2024
0d791f5
refactor: use separate child table for summary
ruthra-kumar Feb 4, 2024
a303788
chore: remove unwanted UI code
ruthra-kumar Feb 4, 2024
833df2c
refactor: make Excluded doctype table read only
ruthra-kumar Feb 4, 2024
341e467
refactor: validate status before running events
ruthra-kumar Feb 4, 2024
c38cfd1
chore: show correct status in list view
ruthra-kumar Feb 4, 2024
97ed905
refactor: reset all flags and remove unwanted code
ruthra-kumar Feb 5, 2024
e600109
refactor: no copy on summary table and more validations
ruthra-kumar Feb 5, 2024
962105b
refactor: validations to prevent duplicate jobs
ruthra-kumar Feb 5, 2024
e142dac
chore: hide docfield in list view
ruthra-kumar Feb 5, 2024
e908003
refactor: make sure only one task is running for doc
ruthra-kumar Feb 5, 2024
cf6cb80
refactor: barebones hook on all doctypes with 'company' field
ruthra-kumar Feb 7, 2024
0ea9ce7
refactor: better method naming
ruthra-kumar Feb 8, 2024
1110dd9
chore: code cleanup
ruthra-kumar Mar 19, 2024
5e59038
refactor: exception propogation
ruthra-kumar Mar 19, 2024
6ae9eb2
refactor: minor UI tweaks
ruthra-kumar Mar 19, 2024
d496a1e
chore: move status and error log to their own section
ruthra-kumar Mar 19, 2024
fab5c11
chore: rename entry point
ruthra-kumar Mar 20, 2024
b429f75
refactor: link running doc validation to company master
ruthra-kumar Mar 20, 2024
1fe1433
refactor: ability to process in single transaction
ruthra-kumar Mar 20, 2024
35fcd03
refactor(test): test cases modified to handle new approach
ruthra-kumar Mar 20, 2024
e5722a7
chore: fix linting issue in JS
ruthra-kumar Mar 20, 2024
87fdb4e
chore: resolve conflicts
ruthra-kumar Mar 20, 2024
5e68ebd
perf: new column posting datetime in SLE to optimize stock ledger rel…
rohitwaghchaure Feb 7, 2024
1767dad
test: test cases to test clash timestamp entries
rohitwaghchaure Feb 15, 2024
ce7a53f
chore: remove microsecond from posting_datetime
rohitwaghchaure Feb 21, 2024
717442c
chore: fix conflicts
rohitwaghchaure Feb 26, 2024
c147ec1
chore: fix conflicts
rohitwaghchaure Feb 26, 2024
1c7128e
chore: fix conflicts
rohitwaghchaure Feb 26, 2024
a694a92
chore: fix conflicts
rohitwaghchaure Feb 26, 2024
44d4096
chore: fix conflicts
rohitwaghchaure Feb 26, 2024
c36a5d1
chore: fix backport issues
rohitwaghchaure Feb 26, 2024
77349a0
chore: fix test case
rohitwaghchaure Feb 26, 2024
957f55f
chore: resolve conflicts
GursheenK Mar 20, 2024
cf3b0ee
chore: resolve conflicts
GursheenK Mar 20, 2024
1df5411
chore: fixed test case
rohitwaghchaure Mar 20, 2024
33e0371
Merge pull request #40571 from frappe/mergify/bp/version-14-hotfix/pr…
GursheenK Mar 20, 2024
1515bb7
refactor: replace get_job with create_job_id utility method
ruthra-kumar Mar 21, 2024
67481ad
Merge pull request #40574 from frappe/mergify/bp/version-14-hotfix/pr…
ruthra-kumar Mar 21, 2024
5791c50
refactor: config changes in Transaction Deletion Record
ruthra-kumar Mar 21, 2024
82b6133
fix: validate gl for previous fiscal year
GursheenK Mar 20, 2024
757cf8a
Merge pull request #40581 from frappe/mergify/bp/version-14-hotfix/pr…
ruthra-kumar Mar 21, 2024
c072cd9
Merge pull request #40583 from frappe/mergify/bp/version-14-hotfix/pr…
GursheenK Mar 21, 2024
2b31113
fix: wrong buying amount if delivered and billed qty varies
rtdany10 Mar 12, 2024
d3a6153
test: buying amt calculation if DN and SI differ in qty
ruthra-kumar Mar 21, 2024
9b3c4ac
fix: rate not fetching from the item price
rohitwaghchaure Mar 21, 2024
5117ba5
Merge pull request #40599 from frappe/mergify/bp/version-14-hotfix/pr…
rohitwaghchaure Mar 21, 2024
390d3a6
perf: add in some indexes (backport #40590) (#40604)
mergify[bot] Mar 22, 2024
6d39a78
Merge pull request #40596 from frappe/mergify/bp/version-14-hotfix/pr…
ruthra-kumar Mar 22, 2024
99faafb
fix: permissions during bulk transaction logs
blaggacao Mar 18, 2024
da17496
Merge pull request #40607 from frappe/mergify/bp/version-14-hotfix/pr…
ruthra-kumar Mar 22, 2024
9e15ecf
refactor: primitive summary for p&l and balance sheet
ruthra-kumar Sep 15, 2023
5ad3918
feat: bisect doctype
ruthra-kumar Sep 15, 2023
57ec0d6
refactor: some logic
ruthra-kumar Sep 18, 2023
1639974
refactor: Depth First Search(DFS)
ruthra-kumar Sep 25, 2023
50963d9
refactor: simplify DFS
ruthra-kumar Sep 25, 2023
0399acd
refactor: support for BFS and DFS
ruthra-kumar Sep 25, 2023
d81be8d
refactor: date validation
ruthra-kumar Sep 25, 2023
a177137
refactor: more buttons
ruthra-kumar Sep 25, 2023
81f456b
refactor: introduce `node` class
ruthra-kumar Sep 25, 2023
66fae64
refactor: ability to build and load tree from DB
ruthra-kumar Sep 25, 2023
674d822
refactor: add basic navigation
ruthra-kumar Sep 25, 2023
609ecbe
chore: remove unwanted code
ruthra-kumar Sep 25, 2023
6afb6ff
feat: nodes doctype
ruthra-kumar Sep 25, 2023
bc1f25b
chore: use doctype as btree
ruthra-kumar Sep 26, 2023
bee5744
refactor: use DB to store tree and state
ruthra-kumar Sep 26, 2023
f06014a
refactor: calculate summary on tree navigation
ruthra-kumar Sep 26, 2023
3cfc778
chore: hide some internal fields
ruthra-kumar Sep 26, 2023
9d5c010
refactor: working heatmap
ruthra-kumar Sep 27, 2023
c2f6f9d
chore: hide internal fields and better painting logic for heatmap
ruthra-kumar Sep 27, 2023
a9a5105
chore: rename btree and remove debugging statements
ruthra-kumar Sep 27, 2023
f9c3096
chore: hide internal variables section
ruthra-kumar Sep 27, 2023
ebea0fd
chore: code cleanup
ruthra-kumar Sep 27, 2023
a76d19f
chore: add screen freeze on wait
ruthra-kumar Sep 27, 2023
84609ab
chore: UI cleanup
ruthra-kumar Sep 27, 2023
cd0a7fe
refactor: adding labels to important section
ruthra-kumar Sep 27, 2023
54e7f30
chore: change data type for summary fields
ruthra-kumar Sep 27, 2023
3cab242
chore: restrict only to administrator and type info
ruthra-kumar Dec 1, 2023
5d90b0f
refactor: save results in node
ruthra-kumar Dec 1, 2023
48bfb9d
refactor: flag to differentiate generated and default values
ruthra-kumar Dec 1, 2023
3a38aac
refactor: cache results
ruthra-kumar Dec 1, 2023
4eb1fbf
chore: resolve linter issues
ruthra-kumar Dec 27, 2023
9f3b6d2
chore: resolve JS linter issue
ruthra-kumar Mar 22, 2024
2f839fb
fix: rate reset to zero
rohitwaghchaure Mar 22, 2024
07929d2
Merge pull request #40618 from frappe/mergify/bp/version-14-hotfix/pr…
rohitwaghchaure Mar 22, 2024
a4ddc4e
Merge pull request #40036 from frappe/mergify/bp/version-14-hotfix/pr…
rohitwaghchaure Mar 22, 2024
ab7f806
Merge pull request #40615 from frappe/mergify/bp/version-14-hotfix/pr…
ruthra-kumar Mar 22, 2024
22cec21
refactor: reset flag for old records
ruthra-kumar Mar 22, 2024
dbb4391
refactor: hide on print formats
ruthra-kumar Mar 22, 2024
c3f9338
fix: remove microsecond from posting datetime (#40017)
rohitwaghchaure Feb 22, 2024
03eb4d7
Merge pull request #40514 from mmdanny89/email-point-of-sale
deepeshgarg007 Mar 23, 2024
39711df
Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr…
mergify[bot] Mar 23, 2024
91400e1
Merge pull request #40628 from frappe/mergify/bp/version-14-hotfix/pr…
rohitwaghchaure Mar 23, 2024
0ec1a88
Merge pull request #40625 from frappe/mergify/bp/version-14-hotfix/pr…
ruthra-kumar Mar 24, 2024
4485121
fix: Add default finance book check in P&L statement
deepeshgarg007 Mar 24, 2024
2723e1f
Merge pull request #40652 from frappe/mergify/bp/version-14-hotfix/pr…
deepeshgarg007 Mar 25, 2024
208a46f
Merge pull request #40505 from frappe/mergify/bp/version-14-hotfix/pr…
deepeshgarg007 Mar 26, 2024
fb252ec
fix: incorrect total qty in job card
rohitwaghchaure Mar 26, 2024
4a1cd94
Merge pull request #40687 from frappe/mergify/bp/version-14-hotfix/pr…
rohitwaghchaure Mar 26, 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
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
// Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt

frappe.ui.form.on("Bisect Accounting Statements", {
onload(frm) {
frm.trigger("render_heatmap");
},
refresh(frm) {
frm.add_custom_button(__("Bisect Left"), () => {
frm.trigger("bisect_left");
});

frm.add_custom_button(__("Bisect Right"), () => {
frm.trigger("bisect_right");
});

frm.add_custom_button(__("Up"), () => {
frm.trigger("move_up");
});
frm.add_custom_button(__("Build Tree"), () => {
frm.trigger("build_tree");
});
},
render_heatmap(frm) {
let bisect_heatmap = frm.get_field("bisect_heatmap").$wrapper;
bisect_heatmap.addClass("bisect_heatmap_location");

// milliseconds in a day
let msiad = 24 * 60 * 60 * 1000;
let datapoints = {};
let fr_dt = new Date(frm.doc.from_date).getTime();
let to_dt = new Date(frm.doc.to_date).getTime();
let bisect_start = new Date(frm.doc.current_from_date).getTime();
let bisect_end = new Date(frm.doc.current_to_date).getTime();

for (let x = fr_dt; x <= to_dt; x += msiad) {
let epoch_in_seconds = x / 1000;
if (bisect_start <= x && x <= bisect_end) {
datapoints[epoch_in_seconds] = 1.0;
} else {
datapoints[epoch_in_seconds] = 0.0;
}
}

new frappe.Chart(".bisect_heatmap_location", {
type: "heatmap",
data: {
dataPoints: datapoints,
start: new Date(frm.doc.from_date),
end: new Date(frm.doc.to_date),
},
countLabel: "Bisecting",
discreteDomains: 1,
});
},
bisect_left(frm) {
frm.call({
doc: frm.doc,
method: "bisect_left",
freeze: true,
freeze_message: __("Bisecting Left ..."),
callback: (r) => {
frm.trigger("render_heatmap");
},
});
},
bisect_right(frm) {
frm.call({
doc: frm.doc,
freeze: true,
freeze_message: __("Bisecting Right ..."),
method: "bisect_right",
callback: (r) => {
frm.trigger("render_heatmap");
},
});
},
move_up(frm) {
frm.call({
doc: frm.doc,
freeze: true,
freeze_message: __("Moving up in tree ..."),
method: "move_up",
callback: (r) => {
frm.trigger("render_heatmap");
},
});
},
build_tree(frm) {
frm.call({
doc: frm.doc,
freeze: true,
freeze_message: __("Rebuilding BTree for period ..."),
method: "build_tree",
callback: (r) => {
frm.trigger("render_heatmap");
},
});
},
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,194 @@
{
"actions": [],
"allow_rename": 1,
"creation": "2023-09-15 21:28:28.054773",
"default_view": "List",
"doctype": "DocType",
"editable_grid": 1,
"engine": "InnoDB",
"field_order": [
"section_break_cvfg",
"company",
"column_break_hcam",
"from_date",
"column_break_qxbi",
"to_date",
"column_break_iwny",
"algorithm",
"section_break_8ph9",
"current_node",
"section_break_ngid",
"bisect_heatmap",
"section_break_hmsy",
"bisecting_from",
"current_from_date",
"column_break_uqyd",
"bisecting_to",
"current_to_date",
"section_break_hbyo",
"heading_cppb",
"p_l_summary",
"column_break_aivo",
"balance_sheet_summary",
"b_s_summary",
"column_break_gvwx",
"difference_heading",
"difference"
],
"fields": [
{
"fieldname": "column_break_qxbi",
"fieldtype": "Column Break"
},
{
"fieldname": "from_date",
"fieldtype": "Datetime",
"label": "From Date"
},
{
"fieldname": "to_date",
"fieldtype": "Datetime",
"label": "To Date"
},
{
"default": "BFS",
"fieldname": "algorithm",
"fieldtype": "Select",
"label": "Algorithm",
"options": "BFS\nDFS"
},
{
"fieldname": "column_break_iwny",
"fieldtype": "Column Break"
},
{
"fieldname": "current_node",
"fieldtype": "Link",
"label": "Current Node",
"options": "Bisect Nodes"
},
{
"fieldname": "section_break_hmsy",
"fieldtype": "Section Break"
},
{
"fieldname": "current_from_date",
"fieldtype": "Datetime",
"read_only": 1
},
{
"fieldname": "current_to_date",
"fieldtype": "Datetime",
"read_only": 1
},
{
"fieldname": "column_break_uqyd",
"fieldtype": "Column Break"
},
{
"fieldname": "section_break_hbyo",
"fieldtype": "Section Break"
},
{
"fieldname": "p_l_summary",
"fieldtype": "Float",
"read_only": 1
},
{
"fieldname": "b_s_summary",
"fieldtype": "Float",
"read_only": 1
},
{
"fieldname": "difference",
"fieldtype": "Float",
"read_only": 1
},
{
"fieldname": "column_break_aivo",
"fieldtype": "Column Break"
},
{
"fieldname": "column_break_gvwx",
"fieldtype": "Column Break"
},
{
"fieldname": "company",
"fieldtype": "Link",
"label": "Company",
"options": "Company"
},
{
"fieldname": "column_break_hcam",
"fieldtype": "Column Break"
},
{
"fieldname": "section_break_ngid",
"fieldtype": "Section Break"
},
{
"fieldname": "section_break_8ph9",
"fieldtype": "Section Break",
"hidden": 1
},
{
"fieldname": "bisect_heatmap",
"fieldtype": "HTML",
"label": "Heatmap"
},
{
"fieldname": "heading_cppb",
"fieldtype": "Heading",
"label": "Profit and Loss Summary"
},
{
"fieldname": "balance_sheet_summary",
"fieldtype": "Heading",
"label": "Balance Sheet Summary"
},
{
"fieldname": "difference_heading",
"fieldtype": "Heading",
"label": "Difference"
},
{
"fieldname": "bisecting_from",
"fieldtype": "Heading",
"label": "Bisecting From"
},
{
"fieldname": "bisecting_to",
"fieldtype": "Heading",
"label": "Bisecting To"
},
{
"fieldname": "section_break_cvfg",
"fieldtype": "Section Break"
}
],
"hide_toolbar": 1,
"index_web_pages_for_search": 1,
"issingle": 1,
"links": [],
"modified": "2023-12-01 16:49:54.073890",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Bisect Accounting Statements",
"owner": "Administrator",
"permissions": [
{
"create": 1,
"delete": 1,
"email": 1,
"print": 1,
"read": 1,
"role": "Administrator",
"share": 1,
"write": 1
}
],
"read_only": 1,
"sort_field": "modified",
"sort_order": "DESC",
"states": []
}
Loading
Loading