Marica
87a0b72c26
Merge pull request #30336 from marination/product-filter-lookup
...
fix: Product Filters Lookup
2022-03-22 15:31:28 +05:30
Rucha Mahabal
0ae6561620
test: get leave allocation records query ( #30342 )
...
Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-03-22 15:14:05 +05:30
Ankush Menat
51873da4bc
test: dynamic current FY creation in before_tests
2022-03-22 14:23:56 +05:30
Ankush Menat
6b638a196b
chore: drop dead sample code
2022-03-22 14:23:56 +05:30
Ankush Menat
9a99f993bc
refactor: merge print settings custom fields
2022-03-22 14:23:56 +05:30
Ankush Menat
457d616966
refactor: remove dead duplicate code
2022-03-22 14:23:56 +05:30
Ankush Menat
f37316a266
refactor: use get_value instead of exists
2022-03-22 13:07:45 +05:30
barredterra
5c4eabf075
fix: usage of frappe.db.exists
2022-03-22 13:07:45 +05:30
Marica
387fa61a83
Merge branch 'develop' into product-filter-lookup
2022-03-22 12:13:46 +05:30
Deepesh Garg
01cd9e7c2e
Merge branch 'develop' into opening_too_field_fixes
2022-03-22 11:53:06 +05:30
Deepesh Garg
4e2f866a2a
Merge branch 'develop' into gst_state_number_unsetting
2022-03-22 11:52:55 +05:30
Deepesh Garg
645ed7d0fd
Merge branch 'develop' into sales_person_dashboard
2022-03-22 11:52:36 +05:30
Deepesh Garg
69a4b8c80b
Merge branch 'develop' into bank_transaction_currency_symbol_fixes
2022-03-22 11:52:20 +05:30
HarryPaulo
3eb5440aa9
fix: linters erros on report sales payments summary ( #30345 )
...
* fix: wrong values for report and get change amout based on payment TYPE.
* charcase for select field.
* fix: linter check erros
* fix: linters errors
Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-03-22 11:39:15 +05:30
Deepesh Garg
636e7f67eb
fix: Opening invoice tool field placement
2022-03-21 19:34:57 +05:30
Deepesh Garg
e78a445c24
fix: Currency symbol in bank transactions
2022-03-21 19:06:04 +05:30
marination
f6e64c2cac
fix: Product Filters Lookup
...
- bind the right classes to the filter lookup field
- make class names more descriptive
- make filter lookup field more visible with white bg and border
- bind lookup input field js in `views.js`
- make filter lookup field functioning for atribute filters too
- added placeholder to lookup field
2022-03-21 17:58:39 +05:30
Deepesh Garg
1b2c6a5b78
fix: Code cleanup
2022-03-21 17:06:23 +05:30
HarryPaulo
01fd3adedf
fix: report sales payments summary ( #30264 )
2022-03-21 16:57:27 +05:30
Deepesh Garg
9376d8d308
Merge pull request #30312 from alyf-de/refactor-sales-analytics
...
refactor: sales analytics
2022-03-21 16:44:23 +05:30
Deepesh Garg
363e676a35
fix: Reset GST State number
2022-03-21 16:28:17 +05:30
Ankush Menat
d3be84bfe8
test: correct use of test decorator
2022-03-21 15:40:34 +05:30
Rucha Mahabal
95568210b2
fix(ux): warning for disabled carry forwarding in Policy Assignment ( #30331 )
2022-03-21 15:30:04 +05:30
mergify[bot]
08e598e2c4
fix: Future recurring period calculation for additional salary ( #29581 ) ( #30330 )
...
* fix: Future recurring period calculation for addl salary
* fix: future recurring period calculation
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
(cherry picked from commit cedabd7242265f354e94d4e4b526db7dbd3d5dda)
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2022-03-21 15:00:55 +05:30
Saqib Ansari
aff7408775
fix(pos): allow validating stock on save
2022-03-21 14:08:56 +05:30
Saqib Ansari
4afb47e869
fix(pos): specific case when serialized item not removed
2022-03-21 13:24:11 +05:30
Saqib Ansari
2f82e237ef
fix(pos): customer group filter in customer selector
2022-03-21 12:47:35 +05:30
Deepesh Garg
3a7776ea7f
fix: Contribution amount against invoices in Sales Person Dashboard
2022-03-21 12:04:18 +05:30
Saqib Ansari
d5fd8e0ba6
fix: prevent multiple save on applying coupon code
2022-03-21 11:36:30 +05:30
Deepesh Garg
1daaf6be2a
Merge pull request #30317 from deepeshgarg007/opening_gl_validation
...
fix: P&L account validation on cancellation
2022-03-21 10:45:07 +05:30
Saqib Ansari
6dc7d6b085
Merge pull request #30287 from nextchamp-saqib/fix-cash-flow-query
...
fix: custom cash flow mapper doesn't show any data
2022-03-21 10:32:42 +05:30
Deepesh Garg
28001ddf42
Merge pull request #30304 from deepeshgarg007/enable_ksa_vat_docs
...
fix: Add permission for KSA VAT documents
2022-03-21 10:18:40 +05:30
Deepesh Garg
2ff6790283
fix: P&L account validation on cancellation
2022-03-21 09:43:31 +05:30
Raffael Meyer
0a015b7f70
refactor: remove redundant if-statement ( #30311 )
2022-03-20 19:29:41 +05:30
Ankush Menat
c2aad115c1
fix: disable deferred naming on SLE/GLE if hash method is used. ( #30286 )
...
* fix: dont rename GLE/SLE that dont have naming series
* test: tests for deferred naming of ledgers
2022-03-20 19:26:34 +05:30
HENRY Florian
ca8d757691
fix: clear "Retain Sample" and "Max Sample Quantity" in Item card if Has Batch No is uncheck ( #30307 )
2022-03-20 15:27:00 +05:30
barredterra
36df21067c
refactor: sales analytics
2022-03-20 03:58:24 +01:00
Ankush Menat
4859574233
perf: Single query to delete bins instead of N
2022-03-19 20:55:27 +05:30
Ankush Menat
684d9d66d1
test: warehouse conversion and treeview test
2022-03-19 20:55:27 +05:30
Ankush Menat
953afda01b
refactor(warehouse): raw query to ORM
2022-03-19 20:55:27 +05:30
Ankush Menat
4b695915f4
refactor: Use QB for serial fetching query
2022-03-19 20:55:27 +05:30
Ankush Menat
a585dff6fd
refactor: batch no filter handling
2022-03-19 20:55:27 +05:30
Ankush Menat
b9eec331e3
test: auto serial fetching
2022-03-19 20:55:27 +05:30
Ankush Menat
4f8bb91eae
fix: sort serial nos before sending
2022-03-19 20:55:27 +05:30
Ankush Menat
0a533d6ccc
fix: skip already selected serials in sr selector
2022-03-19 20:55:27 +05:30
Ankush Menat
5ec27c9055
fix: filter serial nos by selected batch number
2022-03-19 20:55:27 +05:30
Ankush Menat
f4c213379e
fix: set current qty as default qty for stock entry
2022-03-19 20:55:27 +05:30
mergify[bot]
c2cbd407c1
fix: Allow on Submit for Material Request Item Required Date ( #30174 ) ( #30308 )
...
* fix: Allow on Submit for Material Request Item Required Date
* chore: whitespace
(cherry picked from commit cca9668309711bf3ca517726a94df547c5a16bbb)
Co-authored-by: Devarsh Bhatt <58166671+bhattdevarsh@users.noreply.github.com>
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
2022-03-19 20:31:06 +05:30
Deepesh Garg
01638a01cb
Merge pull request #30292 from frappe/mergify/bp/develop/pr-30284
...
fix: Cleanup and fixes in Dimension-wise Accounts Balance Report (backport #30284 )
2022-03-18 17:36:59 +05:30
Deepesh Garg
972d06555a
fix: Add permission for KSA Vat documents
2022-03-18 17:32:46 +05:30
