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
13fb71f642
Merge branch 'develop' into payment_entry_validations_and_trigger_develop
2021-08-11 18:20:42 +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
Suraj Shetty
fd1c47ef77
Merge pull request #26904 from surajshetty3416/fix-list-view
2021-08-11 14:53:58 +05:30
Suraj Shetty
99658ceb4e
fix: Nest .level class style under .hierarchy class
...
- To avoid style overrides in list view
2021-08-11 14:19:07 +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
Deepesh Garg
a1f0cebda5
fix: Do not update settings for test
2021-08-11 11:50:39 +05:30
Deepesh Garg
02f44528f2
test: Add test case for payment entry unlink
2021-08-11 11:50:39 +05:30
Deepesh Garg
7141860c04
test: Update exchange rate in test cases
2021-08-11 11:50:39 +05:30
Deepesh Garg
b5162390e5
fix: Only do specific validations on reference unlink
2021-08-11 11:50:39 +05:30
Deepesh Garg
188bba8feb
fix: Validation for receivingfrom customer against negative outstanding
2021-08-11 11:50:39 +05:30
Deepesh Garg
c5276f3fd3
fix: Multiple fixes in payment entry
2021-08-11 11:50:16 +05:30
Deepesh Garg
a57d13e1e9
fix: Multiple fixes in payment entry
2021-08-11 11:50:16 +05:30
Afshan
976ae13c1e
Merge branch 'develop' into payment-reconc-party-validation-fix
2021-08-11 11:49:27 +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
rohitwaghchaure
a631ac605f
Merge pull request #26892 from rohitwaghchaure/merged-v13-hotfix-into-pre-release
...
chore: merge version-13-hotfix into version-13-pre-release
2021-08-11 00:13:30 +05:30
Deepesh Garg
bff3b0962a
fix: Override template only if setting is enabled
2021-08-10 23:58:27 +05:30
Rucha Mahabal
9855bbb95e
fix(style): apply svg container margin only in desktop view ( #26894 )
2021-08-10 23:53:02 +05:30
Rucha Mahabal
15cb248d9e
fix(style): apply svg container margin only in desktop view
2021-08-10 23:44:08 +05:30
Rohit Waghchaure
7167fd00bc
Merge branch 'version-13-hotfix' into merged-v13-hotfix-into-pre-release
2021-08-10 23:30:16 +05:30
Frappe PR Bot
1167a9bf94
fix: unsetting of payment if no pos profile found ( #26891 )
...
* fix: unseting of payment if no pos profile found (#26884 )
(cherry picked from commit b614834efe
2021-08-10 23:18:23 +05:30
Frappe PR Bot
b7b111c3ed
fix: unseting of payment if no pos profile found ( #26884 ) ( #26890 )
...
(cherry picked from commit b614834efe
2021-08-10 22:52:37 +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
Anupam Kumar
a6aa6cd7d6
fix: timesheet amount issue ( #25993 )
...
* fix: timesheet amount issue
* fix: timesheet detail rate conversion
* fix: condition to check timesheet currency
* fix: removing console statement
2021-08-10 20:32:15 +05:30
Rucha Mahabal
52cd007292
fix: make bundled assets for hierarchy chart
2021-08-10 20:13:28 +05:30
Frappe PR Bot
1a39d1a311
fix: cost center & account validation in Sales/Purchase Taxes and Charges ( #26881 )
2021-08-10 19:38:39 +05:30
Anuja Pawar
66784a16cb
fix: Sales Return cancellation if linked with Payment Entry ( #26883 )
2021-08-10 19:38:16 +05:30
Marica
d657f39ab8
Merge pull request #25622 from noahjacob/promo_scheme_feat
...
feat: added multi-select fields to create multiple pricing rules.
2021-08-10 19:09:42 +05:30
marination
55d8aaf0b6
fix: Stock Analytics Report must consider warehouse during calculation
2021-08-10 19:01:05 +05:30
Marica
af9863146d
fix: Grammar in Error message
2021-08-10 18:49:07 +05:30
Noah Jacob
49b7c7575e
refactor: code cleanup
2021-08-10 18:35:46 +05:30
Noah Jacob
4ee6e32d74
test(fix): fixed test case
2021-08-10 18:34:18 +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
Rucha Mahabal
f9afade7dc
fix: test
2021-08-10 18:02:41 +05:30
Rucha Mahabal
c1bb4eec9c
fix: remove unnecessary imports
2021-08-10 18:02:31 +05:30
Rucha Mahabal
5f0edca3f3
fix(style): longer titles overflowing
2021-08-10 18:02:21 +05:30
Rucha Mahabal
78f50a9809
feat: Export chart option in desktop view
2021-08-10 18:02:05 +05:30
Rucha Mahabal
58c31c72c3
feat: add html2canvas for easily exporting html to images using canvas
2021-08-10 18:01:52 +05:30
Rucha Mahabal
6f799d17ce
feat: Expand All nodes option in Desktop view
2021-08-10 18:01:15 +05:30
Rucha Mahabal
951b3a4313
fix: sider
2021-08-10 18:01:06 +05:30
