Anupam Kumar
925eca0e4a
fix: multiple CRM fixes ( #29507 )
...
* fix: multiple CRM fixes
2022-01-29 22:32:03 +05:30
Rucha Mahabal
cc4b4046ce
Merge pull request #29506 from ruchamahabal/fix-interview-ratings
2022-01-29 21:51:30 +05:30
Rucha Mahabal
0d5993d288
Merge branch 'develop' into fix-interview-ratings
2022-01-29 21:24:46 +05:30
Rucha Mahabal
d98290bfb9
test: get interview details for applicant dashboard
...
- rectify tests as per new rating field changes (fractional and configurable)
2022-01-29 21:15:49 +05:30
Rucha Mahabal
d96f4bf628
fix: move average calculation to interview controller
2022-01-29 20:27:15 +05:30
Rucha Mahabal
69eb3a0ac9
fix: interview ratings on job applicant dashboard
2022-01-29 20:05:07 +05:30
Rucha Mahabal
5d85c5a660
fix: designation mapping from job applicant to job offer
...
- group create buttons
2022-01-29 20:04:40 +05:30
Deepesh Garg
eba06212e8
Merge pull request #29350 from deepeshgarg007/asset_split
...
feat: Splitting group assets
2022-01-29 16:12:04 +05:30
Rucha Mahabal
36882f3734
fix: Employee Onboarding and Separation UX ( #29504 )
2022-01-29 15:27:36 +05:30
Ankush Menat
43bd88e741
fix: work order serial no allows storing whitespace
2022-01-29 14:01:21 +05:30
Ankush Menat
e177c5277f
fix: extend sr_no cleanup to packed items too
2022-01-29 14:01:21 +05:30
Ankush Menat
b20df3745e
refactor: reusable clean_serial_nos
2022-01-29 14:01:21 +05:30
Ankush Menat
14e3e163ae
fix: ignore alternate item while checking pending qty
2022-01-29 13:59:25 +05:30
Deepesh Garg
36bff953b0
Merge pull request #29501 from frappe/mergify/bp/develop/pr-29428
...
fix: Add shipping charges to taxes only if applicable (backport #29428 )
2022-01-29 13:55:48 +05:30
Deepesh Garg
2bf405d44c
fix:Add shipping charges to taxes only if applicable
...
(cherry picked from commit e8bc4f12a734ff286a008e6b31dffa9c6c946365)
2022-01-29 07:27:21 +00:00
Deepesh Garg
4d87465698
Merge branch 'develop' into asset_split
2022-01-29 12:54:44 +05:30
Saqib Ansari
452a809ef4
Merge pull request #28877 from nextchamp-saqib/multiple-pricing-rule-fix
...
fix: qty filter not working if apply_multiple_pricing_rules is enabled
2022-01-29 12:43:41 +05:30
Deepesh Garg
5090959dc1
Merge branch 'develop' of https://github.com/frappe/erpnext into asset_split
2022-01-29 12:12:52 +05:30
Ankush Menat
28994c0e76
test: delete data after running test
2022-01-28 13:50:57 +05:30
Ankush Menat
e4c220053f
fix(patch): update BOMs to have correct transfer_material_against
2022-01-28 13:22:47 +05:30
Ankush Menat
86efa0dbfd
fix: ensure correct-ish transfer against
2022-01-28 13:22:47 +05:30
Ankush Menat
251576a6bb
chore: disable annoying flake8 formatting for QB ( #29488 )
...
[skip ci]
2022-01-28 13:17:43 +05:30
mergify[bot]
0dafa8a12a
fix: stock ledger rendering glitch
...
undefined Issue
(cherry picked from commit f38004219518e901eb736780b181c19fe88ce823)
Co-authored-by: smehata <53169014+smehata@users.noreply.github.com>
2022-01-27 20:23:24 +05:30
Ankush Menat
b05287dea0
fix: drop six code ( #29479 )
2022-01-27 20:08:05 +05:30
rohitwaghchaure
b75b00fefc
feat: provision to exclude exploded items in the BOM ( #29450 )
2022-01-27 12:44:01 +05:30
Suraj Shetty
0cb965f223
Merge pull request #29471 from frappe/fix-sorting
2022-01-27 11:15:57 +05:30
Suraj Shetty
29c7947db0
fix: Further sort sales_order_analysis to get consistent response
...
Since the data was sorted by `transaction_date`, report sorting order used to be inconsistent everytime if there were lots of records with same transaction date. This used to create problems while exporting report as "Excel" with filters.
2022-01-27 11:11:37 +05:30
Rucha Mahabal
6c1c85be0c
feat: additional doctypes access for ESS user ( #29317 )
2022-01-27 00:51:29 +05:30
Ankush Menat
7eab945d8c
refactor: move existing patches to post migration ( #28940 )
...
Also remove duplicates :')
2022-01-26 12:40:21 +05:30
Ankush Menat
f5f3552abb
test: cover more reports in test
2022-01-25 23:22:14 +05:30
Deepesh Garg
c6a17d1966
Merge pull request #29434 from frappe/mergify/bp/develop/pr-29404
...
fix: Previous document currency getting overridden (backport #29404 )
2022-01-25 15:50:06 +05:30
Marica
a707d3705c
Merge pull request #29426 from marination/mr-safeguard
...
fix: Use get for conditionally available fields while setting missing values
2022-01-25 12:51:40 +05:30
mergify[bot]
f469ec87d9
fix: broken patches (backport #29067 ) ( #29406 )
...
* chore: patch fixes
(cherry picked from commit 8b5b146f6d2720587a16f78a8d47840be8dca2b7)
# Conflicts:
# erpnext/patches/v13_0/make_homepage_products_website_items.py
* fix: remove desktop icons while deleting sales reports
(cherry picked from commit 5f72026cb932d01fc827c382747e996a94b441fd)
* refactor: dont ignore dangerous exceptions in patches
(cherry picked from commit 0aa1ea8aeb7757592616bd491de98c69fef08854)
* fix: make patch kinda idempotent
with previous query rerunning would've caused all values to become 0.
* chore: conflicts
* fix: check type before patching
Co-authored-by: Saurabh <saurabh6790@gmail.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-01-25 11:14:08 +05:30
Ankush Menat
b8fbfed096
fix: fetch "transfer material against" from BOM ( #29435 )
2022-01-24 21:45:51 +05:30
Deepesh Garg
b72cdb4bca
fix: Previous document currency getting overriden
...
(cherry picked from commit ef782fd35b0717e3f7c50dbb6c5dde7c96ae9ef6)
2022-01-24 15:19:54 +00:00
Rucha Mahabal
a1f0cb4ed1
fix: honour 'include holidays' setting while marking attendance for leave application ( #29425 )
2022-01-24 19:05:24 +05:30
Ankush Menat
3d3f0139fd
test: clear singles cache for changed settings ( #29430 )
2022-01-24 18:44:08 +05:30
marination
78b6b29a57
fix: Use get for conditionally available fields while setting missing values
...
- Due to custom field "supplier" and missing field "supplier_address", dot operator breaks
- Make sure to use "get" instead of just dot operator if field is in some doctypes, not all
2022-01-24 13:39:10 +05:30
Deepesh Garg
108d1045e6
Merge pull request #29360 from ruthra-kumar/test_case_deferred_report
...
test: unit test for deferred item with zero months
2022-01-24 12:41:37 +05:30
Deepesh Garg
34be90b396
Merge pull request #29407 from ruthra-kumar/dimension_in_opening_invoice
...
fix: opening invoice creation tool can fetch multiple accounting dimension
2022-01-24 12:36:20 +05:30
rohitwaghchaure
19b1b7f8cc
Merge pull request #29419 from rohitwaghchaure/fix-incorrect-rm-qty-in-stock-entry
...
fix: incorrect raw materials quantity in manufacture stock entry
2022-01-24 12:13:54 +05:30
Rohit Waghchaure
f8d232ac26
fix: incorrect raw materials quantity in manufacture stock entry
2022-01-24 11:35:06 +05:30
rohitwaghchaure
a3ec78991f
Merge pull request #29353 from anupamvs/crm-contact-duplication-develop
...
fix: contact duplication on converting lead to customer
2022-01-24 10:16:49 +05:30
ruthra
f122a47d0d
refactor: fix failing test cases
2022-01-24 10:08:25 +05:30
ruthra
80ea163953
fix: linter issue
2022-01-23 21:49:02 +05:30
mergify[bot]
8e3cd1ab31
fix: Don't delete barcode while saving Item ( #29411 ) ( #29417 )
...
(cherry picked from commit 096e7b9ec5e3b67983cfa3a06335fba435f88c97)
Co-authored-by: Britlog <info@britlog.com>
2022-01-23 17:04:55 +05:30
ruthra
88463dc494
test: validating custom accouting dimension in opening invoice tool
...
- create new dimension 'department'
- assign and validate department in opening invoices
2022-01-21 19:33:06 +05:30
ruthra
e2267cdba8
fix: opening invoice creation tool not taking in accouting dimension
2022-01-21 19:21:26 +05:30
Saqib Ansari
0a24953906
Merge pull request #29367 from nextchamp-saqib/fix-credit-balance-report
...
fix: bypass_credit_limit_check in credit balance report
2022-01-21 16:36:48 +05:30
Ankush Menat
dc8dad4456
fix(patch): skip patch if column doesn't exist
2022-01-21 16:12:13 +05:30
