Ankush Menat
c9dcf31cf7
test: ensure super()setUpClass is called
2022-03-23 19:46:50 +05:30
Deepesh Garg
9c607dd6c5
Merge pull request #30323 from deepeshgarg007/sales_person_dashboard
...
fix: Contribution amount against invoices in Sales Person Dashboard
2022-03-23 16:57:18 +05:30
Deepesh Garg
993cc287d5
Merge branch 'develop' into sales_person_dashboard
2022-03-23 16:11:22 +05:30
Ankush Menat
6418dc1606
fix: make auto created job cards "Open"
2022-03-23 15:50:46 +05:30
Ankush Menat
e1f5620654
fix: material transfer status should be before WIP
2022-03-23 15:50:46 +05:30
Ankush Menat
4aa74af90d
fix: ignore items without info for pending qty computation
2022-03-23 15:46:40 +05:30
Ankush Menat
be16fb9dbb
chore(DX): add sourceURL for debugging
2022-03-23 15:46:40 +05:30
Deepesh Garg
d180d09916
Merge pull request #30372 from deepeshgarg007/price_list_ignore_fix
...
fix: Check if onload property exists in the form object
2022-03-23 13:56:01 +05:30
Deepesh Garg
78ca88d227
fix: Check if onload property exists in the form object
2022-03-23 13:55:05 +05:30
Deepesh Garg
c3f1ad78aa
Merge pull request #30361 from deepeshgarg007/tax_account_display
...
fix: GST account not showing up in tax templates
2022-03-23 13:17:11 +05:30
Deepesh Garg
83fc05ef7d
Merge pull request #30365 from deepeshgarg007/ignore_price_list
...
fix: Changing item prices on converting orders/receipts to invoices
2022-03-23 10:09:33 +05:30
Deepesh Garg
3a1e31592e
Merge branch 'develop' into ignore_price_list
2022-03-23 09:27:44 +05:30
Deepesh Garg
405dcb1d3c
fix: Add ignore pricelist for missing flows
2022-03-23 09:04:03 +05:30
Deepesh Garg
66ca085e39
fix: Changing item prices on converting orders/receipts to invoices
2022-03-22 23:03:41 +05:30
Deepesh Garg
57924599da
fix: GST account not showing up in tax templates
2022-03-22 18:26:58 +05:30
Ankush Menat
f606d2ecc6
fix: flaky salary slip email test ( #30358 )
2022-03-22 17:36:18 +05:30
Ankush Menat
41db43cdc5
fix: consider full integer batch nos
2022-03-22 16:40:17 +05:30
Ankush Menat
a18c687844
fix: ignore already fetched serial no
...
exclude_sr_nos is sent as JSON string of list, so load it before
operating on it.
2022-03-22 16:40:17 +05:30
Deepesh Garg
ec04242d72
Merge pull request #30340 from deepeshgarg007/opening_too_field_fixes
...
fix: Opening invoice tool field placement
2022-03-22 16:17:12 +05:30
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
645ed7d0fd
Merge branch 'develop' into sales_person_dashboard
2022-03-22 11:52:36 +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
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
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
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
Deepesh Garg
3a7776ea7f
fix: Contribution amount against invoices in Sales Person Dashboard
2022-03-21 12:04:18 +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
