Commit Graph

33340 Commits

Author SHA1 Message Date
Rohit Waghchaure
0b71801462 fix: incorrect delink serial no and batch 2020-11-20 12:59:00 +05:30
rohitwaghchaure
896b9ef495
Merge pull request #23960 from rohitwaghchaure/incorrect-delink-serial-no-and-batch-v13-beta
fix: incorrect delink serial no and batch
2020-11-19 18:42:13 +05:30
Rohit Waghchaure
b6ef59f8e9 fix: incorrect delink serial no and batch 2020-11-19 16:15:32 +05:30
rohitwaghchaure
9e0f752fba
Merge pull request #23911 from rohitwaghchaure/not-able-to-save-bom-v13-pre
fix: not able to save bom
2020-11-14 14:32:02 +05:30
Rohit Waghchaure
30c704a4cb fix: not able to save bom 2020-11-14 07:15:19 +05:30
Saurabh
7c06c28216 fix: merge-conflicts 2020-11-06 19:08:58 +05:30
Saurabh
e7ab61da9a bumped to version 13.0.0-beta.5 2020-11-06 19:23:55 +05:50
rohitwaghchaure
8cbcd54f3b
chore: change log for v13-beta-pre-release-5 (#23846) 2020-11-06 18:48:34 +05:30
Saqib
1090181204
fix: auto fetch sr nos with modifed conversion factor (#23855) 2020-11-06 18:19:26 +05:30
Deepesh Garg
b4774ae65d
Merge pull request #23852 from frappe/pre-release
fix: [revert] provision to draft quotation from portal
2020-11-06 17:59:00 +05:30
Anupam Kumar
bdb8a4023a
Delete test_parameter.py 2020-11-06 17:13:02 +05:30
Anupam Kumar
a739554b7d
Delete parameter.py 2020-11-06 17:12:44 +05:30
Anupam Kumar
c7f8204997
Delete parameter.json 2020-11-06 17:12:21 +05:30
Anupam Kumar
b4bad63e25
Delete parameter.js 2020-11-06 17:11:47 +05:30
Anupam Kumar
ec7002625f
Delete __init__.py 2020-11-06 17:11:33 +05:30
Anupam
14ef229b12 Revert "Update item_add_to_cart.html"
This reverts commit 5b3af82e75.
2020-11-06 16:50:15 +05:30
Anupam
886b680e1b revert changes 2020-11-06 16:48:39 +05:30
Anupam
beba8da0a6 Merge branch 'version-13-beta-pre-release' of https://github.com/frappe/erpnext into pre-release 2020-11-06 16:38:16 +05:30
Anupam Kumar
ca9b58589b
fix: replaced formatdate -> format_date (#23847)
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-11-06 14:56:27 +05:30
Marica
d07f6b7ef6
Merge pull request #23848 from AfshanKhan/fix-stock-mismatch-filter-pre-release
fix: showing error for wrong filters.
2020-11-06 13:42:07 +05:30
Marica
0d441b66cd
Merge pull request #23808 from nabinhait/web-page-bank-statement-section-pre-release
fix: Added link of bank reconciliation and clearance in accounting desk page
2020-11-06 13:16:44 +05:30
marination
427c1bb0a7 fix: Add missing links
- Added Bank Transaction Statement Entry and Bank Statement Settings
2020-11-06 13:08:53 +05:30
Afshan
4d3e83682e fix: showing error for wrong filters. 2020-11-06 12:25:46 +05:30
Anupam
bab078b4f5 fix: replaced formatdate -> format_date 2020-11-06 12:05:45 +05:30
rohitwaghchaure
c83769c3d1
Merge pull request #23842 from rohitwaghchaure/multiple-pricing-rules-are-not-applied-pre-release
fix: multiple pricing rules are not working on selling side
2020-11-06 01:06:45 +05:30
Rohit Waghchaure
88e0a64df2 added test cases 2020-11-05 20:07:27 +05:30
Rohit Waghchaure
2fe3b1807f fix: multiple pricing rules are not working on selling side 2020-11-05 20:07:19 +05:30
Saqib
65820f6b6c
fix: cannot expand row in update items dialog (#23840) 2020-11-05 17:38:43 +05:30
Saqib
76cd680c57
fix: asset finance book depreciation posting date fix (#23834) 2020-11-05 16:37:19 +05:30
Marica
596656b372
Merge pull request #23824 from marination/delete-quoted-item-old-report-pre-release
chore: Delete Quoted Item Comparison Report
2020-11-05 10:03:58 +05:30
Marica
0c74cd8872
Merge pull request #23821 from marination/so-to-po-dialog-fix-v13-beta
fix: SO to PO Mapping Issue
2020-11-05 09:26:32 +05:30
Marica
5c4b35e65e
Merge pull request #23827 from marination/rfq-test-fixes-pre-release
chore: Reposition RFQ fields
2020-11-05 09:24:29 +05:30
Abhishek Balam
48d9173a55
Merge pull request #23828 from abhishekbalam/psoa_testcase_fix
fix(PSOA): key error if no customers found
2020-11-05 00:21:24 +05:30
Abhishek Balam
5db99e0649 fix: code improvement, match error type for message 2020-11-04 23:43:11 +05:30
Abhishek Balam
5fe3abcfae fix: sales person without customer link throwing keyerror 2020-11-04 23:23:34 +05:30
marination
edd9080ea6 chore: Reposition RFQ fields 2020-11-04 22:13:57 +05:30
Rucha Mahabal
dd7f4df669
fix: Budget test cases (#23822) 2020-11-04 21:59:08 +05:30
marination
75fcfbb49c chore: Delete Quoted Item Comparison Report 2020-11-04 21:24:04 +05:30
marination
e3864c9b16 fix: Make sure row object has doctype so that read only property is applied to rows 2020-11-04 21:08:36 +05:30
marination
413b1c3b43 fix: SO to PO Mapping Issue
- removed type: GET , which made the URL longer
- Added only relevant fields from Items table to Dialog table to reduce args load
- Made separate method to set table data in dialog
- Added freeze message
2020-11-04 21:08:27 +05:30
Rucha Mahabal
de79dd36e7
Merge pull request #23818 from ruchamahabal/fix-therapy-plan-template-v13
fix: therapy plan and session fixes
2020-11-04 21:06:58 +05:30
Rucha Mahabal
e50697d459 fix: sider 2020-11-04 20:24:04 +05:30
Rucha Mahabal
40246caf5e fix: therapy plan and session fixes 2020-11-04 20:13:53 +05:30
Mangesh-Khairnar
5756798689
fix: update integrations desk page (#23772) 2020-11-04 16:44:44 +05:30
rohitwaghchaure
ed2f9edcdd
Merge pull request #23813 from rohitwaghchaure/fixed-sequence-id-column-display-pre-release
fix: on save sequence id column override with workstation
2020-11-04 14:25:58 +05:30
Rohit Waghchaure
58c538d46b fix: on save sequence id column override with workstation 2020-11-04 13:35:42 +05:30
rohitwaghchaure
e0828a80c7
Merge pull request #23811 from rohitwaghchaure/sequence-id-column-override-withoperation-pre
fix: sequence id override with operation column
2020-11-04 13:16:21 +05:30
Rohit Waghchaure
4cf346c082 fix: sequence id override with operation column 2020-11-04 13:14:28 +05:30
Nabin Hait
da14a76ee0 fix: Added link of bank reconciliation and clearance in accounting desk page 2020-11-04 13:06:36 +05:30
Rucha Mahabal
bc8809f4bf
Merge pull request #23800 from ruchamahabal/fix-ipme-v13
fix: Inpatient Medication Order and Entry fixes
2020-11-03 15:41:52 +05:30