Rucha Mahabal
bf75ea70fb
feat: Training Event Status Update and Validations ( #26698 )
* fix: training event employee status not updated on feedback submission
* feat: update attendees status on training event status update
* test: Training Event and Feedback
* chore: remove unused import
3 years ago
Deepesh Garg
8410e4854f
fix: Budget variance missing values
3 years ago
Deepesh Garg
3b4258b817
Merge pull request #26958 from deepeshgarg007/export_type_mandatory_v13_pre
fix: Add mandatory depends on condition for export type field
3 years ago
18alantom
f7b747e19c
refactor: reduce steps, reword cards
3 years ago
18alantom
599c1024a2
fix: semgrep, remove trailing and leading whitespaces
3 years ago
18alantom
95992a7ea5
refactor: fix typo, remove target warehouse cause SE Type dependency
3 years ago
18alantom
37466631f2
refactor: reorder steps according to stock settings refactor
3 years ago
18alantom
9581836885
refactor: add watch video step for stock opening balance
3 years ago
18alantom
1d67d20185
refactor: remove DN, PR; change wording, add/remove steps in tour
3 years ago
18alantom
51d2317bb5
refactor: sider/semgrep
3 years ago
18alantom
1851232e3c
refactor: move trailing whitespace out of translate func
3 years ago
18alantom
0b669b3d7e
refactor: add form tour for stock module onboarding
3 years ago
18alantom
23e1d2b536
refactor: update stock onboarding
3 years ago
Anupam Kumar
a9a24051c9
feat: enable track changes for leave type ( #26917 )
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
3 years ago
Deepesh Garg
4b9c127494
Merge branch 'version-13-pre-release' of https://github.com/frappe/erpnext into export_type_mandatory_v13_pre
3 years ago
Deepesh Garg
b58b1127f3
fix: Add mandatory depends on condition for export type field
3 years ago
Deepesh Garg
9b564a7b51
Merge pull request #26955 from deepeshgarg007/export_type_mandatory
fix: Add mandatory depends on condition for export type field
3 years ago
Deepesh Garg
3f07bb7021
fix: Add mandatory depends on condition for export type field
3 years ago
Rucha Mahabal
67e3971c3b
fix: Org Chart fixes ( #26952 )
* fix: add z-index to filter to avoid svg wrapper overlapping
* fix: expand all nodes not working when there are only 2 levels
- added dom freeze while expanding all nodes and exporting
3 years ago
Rucha Mahabal
0b4959966c
fix: expand all nodes not working when there are only 2 levels
- added dom freeze while expanding all nodes and exporting
3 years ago
Rucha Mahabal
4c612b7cb2
fix: add z-index to filter to avoid svg wrapper overlapping
3 years ago
Rucha Mahabal
4981746b9a
Merge branch 'develop' into org-chart-develop
3 years ago
Suraj Shetty
1514916520
fix: Nest `.level` class style under `.hierarchy` class ( #26905 )
fix: Nest `.level` class style under `.hierarchy` class
3 years ago
Deepesh Garg
7145e9d183
Merge pull request #26359 from GangaManoj/enable-discount-accounting
feat: Enable discount accounting
3 years ago
Frappe PR Bot
b5926a33b3
fix: unknown attribute "string_type" ( #26947 ) ( #26950 )
(cherry picked from commit 6aed9e26acaf266f7260adab16656d554c6bb022)
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
3 years ago
GangaManoj
f9356ee642
fix: Sider issues
3 years ago
GangaManoj
f977c65e80
fix: Make enable_discount_accounting a class property
3 years ago
GangaManoj
5999760a65
fix: Syntax error
3 years ago
Marica
f1c9766748
Merge pull request #26943 from frappe-pr-bot/backport/version-13-pre-release/26942
fix: (Stock Analytics) Copy previous balance dict object instead of assigning
3 years ago
Deepesh Garg
5122948450
Merge branch 'develop' of https://github.com/frappe/erpnext into enable-discount-accounting
3 years ago
Marica
2e6899fbe4
fix: Copy previous balance dict object instead of assigning ( #26942 )
- Due to plain assignment, dict mutation gave wrong monthly values
(cherry picked from commit fe2a34f171
)
3 years ago
Marica
fe2a34f171
fix: Copy previous balance dict object instead of assigning ( #26942 )
- Due to plain assignment, dict mutation gave wrong monthly values
3 years ago
Ankush Menat
8a6b82b196
ci: ignore js files in unittests ( #26934 )
* ci: ignore js files in unittests
- Avoid running python unittests on PRs that ONLY change JS files.
* ci: ignore md files in test workflows
3 years ago
Shariq Ansari
b32c2fa561
fix: updated erpnext wspace json files ( #26380 )
* fix: updated erpnext wspace json files
* fix: updated wspace json files
* fix: updated wspace json files
* fix: removed padding code from wspace json files
* fix: Updated restrict_to_domain in wspace json
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
3 years ago
Afshan
587d2db6a9
fix: show proper currency symbol in taxes and charges table ( #26827 )
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
3 years ago
Afshan
1de4c01942
fix: Deferred Revenue Section should be collapsible only if its not enabled ( #26928 )
3 years ago
Noah Jacob
b8658d003f
fix: from_warehouse getting set to None ( #26920 )
3 years ago
Frappe PR Bot
f4b2f4aaf7
fix: ZeroDivisionError on creating e-invoice for credit note ( #26918 )
3 years ago
Saqib
88f13fef81
fix: ZeroDivisionError on creating e-invoice for credit note ( #26915 )
3 years ago
Ganga Manoj
54c31ed33c
feat: depreciate asset after sale ( #26543 )
3 years ago
Marica
b1406dba98
Merge pull request #26910 from frappe-pr-bot/backport/version-13-pre-release/26908
fix: Stock Analytics Report must consider warehouse during calculation
3 years ago
Marica
08e4026456
fix: Stock Analytics Report must consider warehouse during calculation ( #26908 )
* fix: Stock Analytics Report must consider warehouse during calculation
* fix: Brand filter in Stock Analytics
(cherry picked from commit 703b081172981833bcf9a1fc5c86517817c3ff32)
3 years ago
Deepesh Garg
f037bae8ea
Merge pull request #26397 from GangaManoj/po-payment-terms
feat: Fetch Payment Terms from linked Sales/Purchase Order
3 years ago
Marica
63027283f3
Merge pull request #26673 from marination/stock-analytics
fix: Stock Analytics Report must consider warehouse during calculation
3 years ago
Deepesh Garg
a7054560da
Merge branch 'develop' into po-payment-terms
3 years ago
Marica
42899d69ea
Merge branch 'develop' into stock-analytics
3 years ago
Deepesh Garg
13fb71f642
Merge branch 'develop' into payment_entry_validations_and_trigger_develop
3 years ago
Deepesh Garg
c0b9e9c1cf
Merge pull request #26656 from ankush/fix_dn_test
test: fix test due to rename change
3 years ago
marination
455d300fca
Revert "test: fix POS Closing Entry Test"
This reverts commit 8f1a3aef2e
.
3 years ago
marination
867939fcae
test: fixed asset movement tests
- set cwip account in company to avoid value missing
- removed unused statement
- removed trailing spaces
3 years ago