Devin Slauenwhite
695e2bcfbc
fix: don't reserve qty on sales return.
2022-05-14 11:06:24 -04:00
Rucha Mahabal
ead08aa192
Merge pull request #31013 from ruchamahabal/hr-reports-emp-status
...
feat: add Employee Status filter in leave balance reports
2022-05-13 22:07:08 +05:30
Rucha Mahabal
260cfa5d1e
test: employee status filter in leave balance reports
2022-05-13 21:02:09 +05:30
Rucha Mahabal
08fb9a4318
fix: translation for status filter
2022-05-13 20:44:35 +05:30
Rucha Mahabal
ed8a49737a
feat: add Employee Status filter in leave balance reports
2022-05-13 20:23:32 +05:30
Rucha Mahabal
3016ed958e
fix(Employee Advance): Return/Deduction from Salary button visibility ( #31011 )
2022-05-13 20:01:14 +05:30
Ankush Menat
86df7f835a
fix: move healthcare patch to post_model_sync ( #31008 )
...
[skip ci]
2022-05-13 18:15:34 +05:30
Ankush Menat
3263ecf54c
test: check translation files ( #31006 )
2022-05-13 16:38:04 +05:30
HarryPaulo
328b1b54d9
fix: payments duplicate on pos closing entry ( #30976 )
2022-05-13 15:06:02 +05:30
Ankush Menat
b0c10102de
chore: update FR template
...
[skip ci]
2022-05-13 14:35:51 +05:30
Deepesh Garg
54d6cf18fc
fix: Item rate reset on changing posting date ( #30990 )
...
* fix: Item rate reset on changing posting date
* chore: Remove debugger
2022-05-13 13:07:23 +05:30
Marica
9a2b11f05f
Merge pull request #30911 from alyf-de/de-translate-employee
...
fix: German translations for Employee doctype
2022-05-13 12:23:13 +05:30
Marica
38e0105125
Merge pull request #30818 from Havenir/feat-request-for-quotation
...
feat: request_for_quotation - show supplier name
2022-05-13 12:16:23 +05:30
Wolfram Schmidt
c4a2778359
chore: added RFQ Link to Opportunity Dashboard ( #30894 )
...
added Link to Dashboard
added backlink to Request for Quotation in the Quotation dashboard for transparency and ease of navigation.
2022-05-13 12:01:52 +05:30
Wolfram Schmidt
0bbed414f8
feat: add Link to Opportunity ( #30614 )
...
Adding Link to Opportunity
Following the process of Opportunity to Quotation I added a section and link field to Opportunity for a backlink when using "create"-> Request for Quotation from Opportunity.
2022-05-13 11:59:45 +05:30
Ankush Menat
b08180092e
fix(patch): avoid checking for return field if it doesnt exits ( #30995 )
...
fix(patch): avoid checking for qty field if it doesnt exits
2022-05-13 11:55:47 +05:30
Saqib Ansari
319c858d63
Merge pull request #30968 from nextchamp-saqib/validate-on-hold-invs
...
fix(accounts): minor fixes & validations
2022-05-12 22:06:35 +05:30
Ankush Menat
cb8cd7f5bc
chore: stale bot - increase # of days for issues
...
[skip ci]
2022-05-12 15:45:19 +05:30
Deepesh Garg
39fad39540
Merge pull request #30983 from frappe/mergify/bp/develop/pr-30982
...
fix: Failing accounting dimension patch (backport #30982 )
2022-05-12 15:28:15 +05:30
Deepesh Garg
b13698a1d5
fix: Failing accounting dimension patch
...
(cherry picked from commit b14a7b8a5db2512f365efb75b9cc75ee3c3fa213)
2022-05-12 09:27:40 +00:00
Marica
5b8c7438cc
Merge pull request #30945 from ankush/stock_analytics_fix
...
fix: stock analytics report shows incorrect data there's no stock movement in a period
2022-05-12 12:26:54 +05:30
Saqib Ansari
6c16422beb
test: sales_invoice_with_disabled_account
2022-05-12 12:05:53 +05:30
Saqib Ansari
92613777b9
test: payment_entry_against_onhold_purchase_invoice
2022-05-12 11:17:36 +05:30
Marica
3d96ad2afa
Merge pull request #30950 from marination/actual-qty-total-js-reactive
...
fix: Set actual qty and basic rate in SE on warehouse triggers (`get_warehouse_details`)
2022-05-11 20:13:54 +05:30
Ankush Menat
2d9b7a48ca
Merge pull request #30832 from dj12djdjs/feat-picklist-scan
...
feat(stock): Proposed Pick List Scan
2022-05-11 19:38:37 +05:30
Ankush Menat
861d4b856c
chore: bump ecma version
...
we transpile to es2017, so allow use of es2020
2022-05-11 19:32:51 +05:30
Ankush Menat
ab80783e3a
refactor: single function to fetch related row
...
There was separate function for batch row which frequently didn't
receive all the love main function received like:
1. empty row reuse
2. max qty validation
Hence it makes sense to combine these in one fat function
2022-05-11 19:27:16 +05:30
Ankush Menat
2f1d118f36
fix: disable serial no scanning for picklist
...
Current design of picklist doc doesn't have "picked serial no" so it
doesn't make much sense to scan it. Instead it should increment qty
only. Might add this in future after fixing UX problems
2022-05-11 18:56:22 +05:30
Ankush Menat
d35a13ec7e
refactor: change alert duration to 3 and modern js
2022-05-11 18:52:14 +05:30
Ankush Menat
7f14222700
docs: document barcode_scanner API
2022-05-11 18:45:31 +05:30
Ankush Menat
372d2d870e
fix: better message for picked qty shortfall
2022-05-11 18:43:10 +05:30
Ankush Menat
d3121fd845
fix(UX): hide scan section for non-draft docs
2022-05-11 18:40:44 +05:30
Ankush Menat
a4f0be6c5e
Merge branch 'develop' into feat-picklist-scan
2022-05-11 18:38:53 +05:30
Marica
d024f72ab8
Merge branch 'develop' into actual-qty-total-js-reactive
2022-05-11 18:02:20 +05:30
marination
4fa15b50ca
test: Test for mapped SE and fix for failing tests
...
- Remove `set_missing_values` from mapper util function since a lot of item data is set after this function is run
- `split_batch` can skip `set_missing_values` since no warehouses are set on mapping and relies on user input
2022-05-11 17:58:48 +05:30
Sagar Sharma
1a70701eca
fix: per_billed for return DN ( #30868 )
...
* fix: per_billed for return DN
* chore: move patch from v14 to v13
2022-05-11 16:49:28 +05:30
Vladislav
40d2f94abd
chore: incorrect translation ( #30966 )
2022-05-11 16:26:48 +05:30
Ankush Menat
60eede0f68
Merge pull request #30969 from ankush/fifo_queue_report
...
chore: fifo queue vs qty after transaction comparison report
2022-05-11 15:12:13 +05:30
marination
90a8e924f5
fix: set_missing_values in SE and re-use the same on all SE mappings
...
- `set_missing_values` in SE will set actual qty, transfer qty and calculate rate/amount
- Re-use `set_missing_values` wherever SE is doc is being mapped
2022-05-11 14:54:22 +05:30
Ankush Menat
f6d6463a33
chore: fifo queue vs qty after transaction comparison report
2022-05-11 14:43:03 +05:30
Saqib Ansari
95b059a98c
fix: validate disabled accounts before posting ledger entries
2022-05-11 13:26:15 +05:30
Saqib Ansari
a1e3ae8869
fix: user can select disabled accounts in taxes table
2022-05-11 13:01:06 +05:30
Saqib Ansari
b0f302e579
fix: validate on hold purchase invoices in payment entry
2022-05-11 12:42:35 +05:30
Ankush Menat
e2e0700499
Merge pull request #30962 from marination/update-items-zero-qty
...
fix: Block 0 Qty via Update Items to be consistent with form validation
2022-05-11 12:41:40 +05:30
Marica
061cd3220f
Merge branch 'develop' into update-items-zero-qty
2022-05-11 11:42:39 +05:30
Raffael Meyer
195e8af985
Merge branch 'develop' into de-translate-employee
2022-05-10 15:57:40 +02:00
marination
0c9154389b
fix: Block 0 Qty via Update Items to be consistent with form validation
2022-05-10 18:09:07 +05:30
Ankush Menat
15fdc1cf7f
Merge pull request #30958 from gavindsouza/dashboard-chart-fixes
...
fix(charts): Pass fieldtype for chart data in selling reports
2022-05-10 17:40:01 +05:30
Gavin D'souza
7bf0e4f8e5
fix(charts): Pass fieldtype for chart data in selling reports
2022-05-10 15:58:31 +05:30
Ankush Menat
198b91f8d4
fix: only carry-forward balances till today's period
...
Showing data in future doesn't make sense. Only carry-forward till last
bucket that contains today's day.
2022-05-10 15:38:02 +05:30
