Deepesh Garg
ea5b7d38bb
Merge pull request #26277 from deepeshgarg007/multi-company-deferred-revenue
...
fix: Auto process deferred accounting for multi-company setup
2021-07-04 20:32:22 +05:30
Deepesh Garg
cd036e115b
Merge pull request #26231 from deepeshgarg007/party_dashboard
...
fix: Do not consider cancelled entries in party dashboard
2021-07-04 20:30:34 +05:30
Anurag Mishra
73db919c99
fix: set query for training events ( #26303 )
...
* fix: set query
* fix: remove whitespace between function and params
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-07-02 17:55:42 +05:30
Ashish Shah
c0817838d9
fix: when lead is created with mobile_no, mobile_no value gets lost ( #26298 )
...
Summary: When a Lead is created with mobile_no, mobile_no value gets lost (mobile_no value is overwritten by phone value)
It is backport of https://github.com/frappe/erpnext/pull/26116
Steps to reproduce
[1]Create a Lead.
[2]Enter
Person Name(lead_name): before_fix
Under Contact section,
enter Phone(phone): 11 and
Mobile No.(mobile_no):22
[3]Save it
[4] F12,
cur_frm.doc.phone : 11 (correct)
cur_frm.doc.mobile_no : 11 (incorrect, it should be 22)
[5]Under Address & Contact section ,check contact_html it shows
before_fix
Phone: 11 (Primary label is missing)
Phone: 22 (incorrect, it should be Mobile No:22, also Primary label is missing)
Actual:
mobile_no value is lost. it is overwritten by phone value
following is image with error (before fix)
Expected:
mobile_no value should be retained
following is image after fix
2021-07-02 15:16:42 +05:30
Anupam Kumar
877597bc16
fix: feating employee in payroll entry ( #26271 )
2021-07-02 13:10:18 +05:30
Jannat Patel
18533e381a
fix: lms progress issue ( #26253 )
2021-07-02 12:57:06 +05:30
Mohammed Yusuf Shaikh
ad6f20c5c7
fix: Added permission for employee to book appointment ( #26255 )
2021-07-02 12:32:22 +05:30
Jannat Patel
5173e74a04
fix: Project Portal Enhancements ( #26290 )
...
* fix: project portal enhancements
* fix: condition for pills
2021-07-02 11:48:46 +05:30
Deepesh Garg
d4146a91d6
Merge pull request #25323 from m1ngaa/patch-1
...
Delete accounts (an empty file)
2021-07-01 23:38:56 +05:30
Anuja Pawar
d8bc514226
fix: to fetch the correct field in Tax Rule ( #25927 )
2021-07-01 14:06:01 +05:30
rohitwaghchaure
117cf4eca6
Merge pull request #26278 from rohitwaghchaure/fixed-employee-selection-issue-in-payroll-entry
...
fix: employee selection not working in payroll entry
2021-07-01 12:31:45 +05:30
rohitwaghchaure
c14fc9530c
Merge pull request #26279 from rohitwaghchaure/fixed-update-cost-not-working-for-draft-bom
...
fix: update cost not working in the draft BOM
2021-07-01 11:57:32 +05:30
Rohit Waghchaure
a856624ccb
fix: employee selection not working in payroll entry
2021-07-01 11:56:55 +05:30
Rohit Waghchaure
0bfd56e615
fix: update cost not working in the draft bom
2021-07-01 11:50:48 +05:30
Deepesh Garg
68c697b354
fix: Auto process deferred accounting for multi-company setup
2021-07-01 09:31:31 +05:30
rohitwaghchaure
d482c41eeb
Merge pull request #26263 from rohitwaghchaure/fixed-removed-unused-file
...
fix: minor removed unused file
2021-06-30 11:36:51 +05:30
Rohit Waghchaure
815e6ec846
fix: minor removed unused file
2021-06-30 11:35:50 +05:30
rohitwaghchaure
2a1d1e1cb1
Merge pull request #26240 from rohitwaghchaure/production-plan-sub-assembly-enhancement
...
feat: provision to make subcontracted purchase order from the production plan
2021-06-30 11:15:11 +05:30
rohitwaghchaure
713c92e6fd
Merge pull request #26259 from rohitwaghchaure/fixed-incorrect-valuation-rate-in-stock-reco
...
fix: incorrect valuation rate in stock reconciliation
2021-06-30 11:11:41 +05:30
Rohit Waghchaure
46b67b901b
fix: incorrect valuation rate in stock reconciliation
2021-06-30 00:31:00 +05:30
Deepesh Garg
a287b22b55
Merge pull request #26252 from deepeshgarg007/loan_security_pledge_on_cancel
...
fix: Cancellation of Loan Security Pledges
2021-06-29 20:23:46 +05:30
Rohit Waghchaure
61690775a8
feat: provision to make subcontracted purchase order from the production plan
2021-06-29 19:59:20 +05:30
Deepesh Garg
9181dde86a
fix: Cancelation of Loan Security Pledges
2021-06-29 17:18:39 +05:30
Rucha Mahabal
91dcc07e26
fix: Employee Inactive status implications ( #26244 )
2021-06-29 15:58:46 +05:30
rohitwaghchaure
09b081ccad
Merge pull request #26241 from rohitwaghchaure/fixed-allow-to-change-to-date
...
fix: allow user to change the To Date in the blanket order even after submit of order
2021-06-29 10:05:04 +05:30
Rohit Waghchaure
2d1c4fee1d
fix: allow to changes to date in the blanket order
2021-06-29 00:33:55 +05:30
Deepesh Garg
7d7d797ffc
fix: Do not consider cancelled entries in party dashboard
2021-06-28 11:24:32 +05:30
rohitwaghchaure
c1853ddf73
Merge pull request #26226 from rohitwaghchaure/fixed-removed-values-out-of-sync-on-stock-transaction-submission
...
fix: removed values out of sync validation from stock transactions
2021-06-26 22:28:42 +05:30
Rohit Waghchaure
170f2ad056
fix: removed values out of sync validation from stock transactions
2021-06-26 21:42:47 +05:30
rohitwaghchaure
9f051a24db
Merge pull request #26213 from rohitwaghchaure/fixed-fetch-bom-items-in-stock-reco
...
fix: fetch batch items in stock reconciliation
2021-06-26 21:21:23 +05:30
Rohit Waghchaure
e5c47f8957
fix: fetch batch items in stock reco
2021-06-26 17:40:27 +05:30
Marica
5474c09c70
Merge pull request #25886 from ankush/work_order_flat_ops
...
fix: order and time of operations in multilevel BOM work order
2021-06-25 16:05:54 +05:30
Ankush Menat
9e43445f36
fix: order and time of operations for multilevel bom
...
- Order of operations was being sorted by idx of individual operations in
BOM table, which made the ordering useless.
- This adds ordering that's sorted from lowest level item to top level
item.
- chore: remove dead functionality. There's no `items` table. Required
item level operations get overwritten on fetching of items /
operations e.g. when clicking on multi-level BOM checkbox.
- test: add test for tree representation
- feat: BOMTree class to get complete representation of a tree
2021-06-25 14:44:55 +05:30
Ankush Menat
6ec8875434
fix(ux): show bom in operations child table
2021-06-25 14:44:53 +05:30
Ankush Menat
ff4aadc657
chore: remove dead and py2 compatibility code
...
form_grid_template doesn't exist
2021-06-25 14:43:49 +05:30
Deepesh Garg
2f0298ee11
Merge pull request #26218 from deepeshgarg007/item_tax_error_fetch
...
fix: Error while fetching item taxes
2021-06-25 14:00:19 +05:30
Deepesh Garg
e955a4ee72
fix: Check for is None
2021-06-25 13:38:06 +05:30
Deepesh Garg
2ca9b765ef
fix: Error while fetching item taxes
2021-06-25 13:34:00 +05:30
Noah Jacob
58daf5f916
fix: precision rate for packed items ( #26046 )
2021-06-25 12:52:17 +05:30
Subin Tom
43f85a2877
fix: changed profitability analysis report width ( #26165 )
2021-06-25 11:38:11 +05:30
Alan
8958f55890
fix: add validation for 'for_qty' else throws errors ( #25829 )
...
* fix: add validation for 'for_qty' else throws errors
* fix: check if for_qty is None
* fix: check purpose
* fix: add purpose to pick list get_doc
* fix: set as read only to prevent se from picking up value
Co-authored-by: Ankush <ankushmenat@gmail.com>
* chore: undo changes to doctype modified timestamp
Co-authored-by: Ankush <ankushmenat@gmail.com>
2021-06-24 21:01:55 +05:30
Ankush
21e44b19f0
perf: don't query unless required (bp #26175 )
...
re-order conditionals so queries are not evaluated unless required.
# Conflicts:
# erpnext/stock/doctype/batch/batch.py
2021-06-24 20:58:07 +05:30
Deepesh Garg
b4b76b75cd
Merge pull request #26176 from deepeshgarg007/item_tax_fetch_fix
...
fix: User is not able to change item tax template
2021-06-24 19:55:49 +05:30
Deepesh Garg
970d2af7ad
Merge pull request #26211 from deepeshgarg007/include_dimension_filter
...
fix: Account filter not working with accounting dimension filter
2021-06-24 19:55:12 +05:30
Deepesh Garg
1564d39bf4
Merge pull request #26188 from deepeshgarg007/internal_transfer_payment_tax_v13
...
fix: Taxes on Internal Transfer payment entry
2021-06-24 19:51:48 +05:30
Deepesh Garg
e3ca177828
fix: Remove debug flag
2021-06-24 19:51:23 +05:30
Deepesh Garg
bdba29bab5
fix: Account filter not working with accounting dimension filter
2021-06-24 19:48:11 +05:30
Ankush
5708b7140b
fix: batch nos in packed items (bp #26105 )
...
* test: batch info in packed_items
* fix(ux): make packed items editable
* refactor: allow custom table name for set_batch
In some doctypes there are multiple child tables requiring batched
items. This change makes the function a bit more flexible.
* fix: Auto fetch batch_nos in packed_item table
2021-06-24 19:38:37 +05:30
Saqib
b3a0a7b432
fix: too many writes while renaming company abbreviation ( #26203 )
2021-06-24 19:30:10 +05:30
Deepesh Garg
1658107a92
fix: Linting fixes
2021-06-24 19:18:50 +05:30
