Commit Graph

37852 Commits

Author SHA1 Message Date
18alantom
f4487c3ae5 refactor: use Form Tour doc instead of controller form tour
note - keeping controller form tours as a fallback, new form tours
seem to work only for Stock Settings
2021-08-20 16:25:20 +05:30
18alantom
77ebbdd172 fix: minor changes
- remove Is Group from warehouse
- change stock entry type
- link to stock entry type
- add posting date to stock reco
- change report to Stock Projected Qty
- highlight quality inspection action
- remove allow neg highlight
2021-08-20 16:21:33 +05:30
18alantom
f7b747e19c refactor: reduce steps, reword cards 2021-08-16 15:14:36 +05:30
18alantom
599c1024a2 fix: semgrep, remove trailing and leading whitespaces 2021-08-16 15:14:22 +05:30
18alantom
95992a7ea5 refactor: fix typo, remove target warehouse cause SE Type dependency 2021-08-16 15:13:45 +05:30
18alantom
37466631f2 refactor: reorder steps according to stock settings refactor 2021-08-16 15:13:14 +05:30
18alantom
9581836885 refactor: add watch video step for stock opening balance 2021-08-16 15:13:05 +05:30
18alantom
1d67d20185 refactor: remove DN, PR; change wording, add/remove steps in tour 2021-08-16 15:12:57 +05:30
18alantom
51d2317bb5 refactor: sider/semgrep 2021-08-16 15:12:28 +05:30
18alantom
1851232e3c refactor: move trailing whitespace out of translate func 2021-08-16 15:12:23 +05:30
18alantom
0b669b3d7e refactor: add form tour for stock module onboarding 2021-08-16 15:12:16 +05:30
18alantom
23e1d2b536 refactor: update stock onboarding 2021-08-16 15:12:09 +05:30
Anupam Kumar
a9a24051c9
feat: enable track changes for leave type (#26917)
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
2021-08-16 14:48:53 +05:30
Deepesh Garg
9b564a7b51
Merge pull request #26955 from deepeshgarg007/export_type_mandatory
fix: Add mandatory depends on condition for export type field
2021-08-16 14:16:32 +05:30
Deepesh Garg
3f07bb7021 fix: Add mandatory depends on condition for export type field 2021-08-16 13:18:39 +05:30
Deepesh Garg
7145e9d183
Merge pull request #26359 from GangaManoj/enable-discount-accounting
feat: Enable discount accounting
2021-08-14 18:05:29 +05:30
Frappe PR Bot
b5926a33b3
fix: unknown attribute "string_type" (#26947) (#26950)
(cherry picked from commit 6aed9e26acaf266f7260adab16656d554c6bb022)

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-08-14 10:48:33 +05:30
GangaManoj
f9356ee642 fix: Sider issues 2021-08-13 17:40:51 +05:30
GangaManoj
f977c65e80 fix: Make enable_discount_accounting a class property 2021-08-13 17:17:58 +05:30
GangaManoj
5999760a65 fix: Syntax error 2021-08-13 17:13:38 +05:30
Deepesh Garg
5122948450 Merge branch 'develop' of https://github.com/frappe/erpnext into enable-discount-accounting 2021-08-13 16:00:20 +05:30
Marica
fe2a34f171
fix: Copy previous balance dict object instead of assigning (#26942)
- Due to plain assignment, dict mutation gave wrong monthly values
2021-08-13 15:37:45 +05:30
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
2021-08-13 12:59:27 +05:30
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>
2021-08-13 12:19:16 +05:30
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>
2021-08-13 10:59:06 +05:30
Afshan
1de4c01942
fix: Deferred Revenue Section should be collapsible only if its not enabled (#26928) 2021-08-12 23:06:34 +05:30
Noah Jacob
b8658d003f
fix: from_warehouse getting set to None (#26920) 2021-08-12 20:03:28 +05:30
Saqib
88f13fef81
fix: ZeroDivisionError on creating e-invoice for credit note (#26915) 2021-08-12 16:26:51 +05:30
Ganga Manoj
54c31ed33c
feat: depreciate asset after sale (#26543) 2021-08-12 13:42:56 +05:30
Deepesh Garg
f037bae8ea
Merge pull request #26397 from GangaManoj/po-payment-terms
feat: Fetch Payment Terms from linked Sales/Purchase Order
2021-08-11 22:28:34 +05:30
Marica
63027283f3
Merge pull request #26673 from marination/stock-analytics
fix: Stock Analytics Report must consider warehouse during calculation
2021-08-11 19:47:56 +05:30
Deepesh Garg
a7054560da
Merge branch 'develop' into po-payment-terms 2021-08-11 19:31:30 +05:30
Marica
42899d69ea
Merge branch 'develop' into stock-analytics 2021-08-11 18:44:29 +05:30
Deepesh Garg
c0b9e9c1cf
Merge pull request #26656 from ankush/fix_dn_test
test: fix test due to rename change
2021-08-11 18:20:17 +05:30
marination
455d300fca Revert "test: fix POS Closing Entry Test"
This reverts commit 8f1a3aef2e.
2021-08-11 17:00:46 +05:30
marination
867939fcae test: fixed asset movement tests
- set cwip account in company to avoid value missing
- removed unused statement
- removed trailing spaces
2021-08-11 16:40:07 +05:30
marination
8f1a3aef2e test: fix POS Closing Entry Test
- Separated into two tests, one checks if SI cancelling is blocked, the other checks PCE cancel impact
- This is done because after cancel via assertRaises, damage done by cancel still exists or is partially comitted
- Dont use this partially cancelled doc for any assertions further, end test at exception assertion
- Use `get_value` to check SI docstatus, as its primary key changes after cancel
2021-08-11 15:17:06 +05:30
marination
bca30d6101 test: fix Shift Request test
- Use `get_value` instead of `get_doc`
- Remove unnecessary loop, only one shift assignment is made against a shift request
- Get value after cancel again. Get doc is not reliable since primary key changed after cancel
2021-08-11 13:29:44 +05:30
marination
e5b0221693 test: fix attendance request tests
- Use `frappe.db.get_value` instead of `get_doc` for asserting values
- Get values after cancellation as reloading attendance doc breaks due to stale doc (primary key changed after cancel of attendance request)
- rollback everything on tearDown
2021-08-11 13:02:49 +05:30
Ankush
c1c9c4b68e
Merge branch 'develop' into fix_dn_test 2021-08-11 11:40:15 +05:30
Ankush
9152715f90
perf: various minor perf fixes for ledger postings (#26775)
* perf: only validate if voucher is journal entry

* perf: optimize merge GLE

- Order fields such that comparison will fail faster
- Break out of loops if not matched

* perf: don't try to match SLE if count mismatch

* refactor: simplify initialize_previous_data

* perf: use cache for fetching valuation_method

These are set only once fields

* refactor: simplify get_future_stock_vouchers

* refactor: simplify get_voucherwise_gl_entries

* perf: fetch only required fields for GL comparison

`select *` fetches all fields, output of this function is only used for
comparing.

* perf: reorder conditions in PL cost center check

* perf: reduce query while validating new gle

* perf: use cache for validating warehouse props

These properties don't change often, no need to query everytime.

* perf: use cached stock settings to validate SLE

* docs: update misleading docstring

Co-authored-by: Marica <maricadsouza221197@gmail.com>
2021-08-11 11:17:50 +05:30
Marica
e8be3a5243
Merge branch 'develop' into stock-analytics 2021-08-11 10:35:33 +05:30
Deepesh Garg
bff3b0962a fix: Override template only if setting is enabled 2021-08-10 23:58:27 +05:30
Afshan
b614834efe
fix: unseting of payment if no pos profile found (#26884) 2021-08-10 21:33:58 +05:30
marination
eb2050b407 fix: Brand filter in Stock Analytics 2021-08-10 20:37:09 +05:30
marination
55d8aaf0b6 fix: Stock Analytics Report must consider warehouse during calculation 2021-08-10 19:01:05 +05:30
Deepesh Garg
6d61340039
Merge pull request #26549 from nemesis189/ignore-mandatory-in-payment-reconcilitation
fix:Ignore mandatory fields while creating payment reconciliation Journal entry
2021-08-10 18:16:49 +05:30
Anuja Pawar
0e337be065
fix: cost center & account validation in Sales/Purchase Taxes and Charges (#25929) 2021-08-10 17:26:35 +05:30
Anuja Pawar
1cba77cfbd
fix: Sales Return cancellation if linked with Payment Entry (#26551) 2021-08-10 17:25:12 +05:30
Saqib
84c4161c00
fix(e-invoicing): cannot cancel invoice if IRN cancelled on portal (#26638) 2021-08-10 16:46:44 +05:30