Rucha Mahabal
517a6d0054
fix: set draft indicators for Asset Maintenance Log listview
2020-08-12 18:01:45 +05:30
Rucha Mahabal
691ec1bd27
fix: don't set maintenance log status as Overdue when Completed or Cancelled
2020-08-12 18:01:07 +05:30
Anupam Kumar
674d1b0803
feat: Material Request and Stock Entry Enhancement ( #22671 )
...
* feat: send to warehouse
* adding warehouse validation
* fix: review changes
* fix: review changes
* stock entry enhancement
* fix: review changes
2020-08-12 17:55:02 +05:30
Rucha Mahabal
e0cc421e50
fix: TypeError while setting transfer_qty in Stock Entry ( #22929 )
...
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-08-12 14:33:30 +05:30
Marica
93df724dc1
Merge pull request #22945 from scmmishra/item-image-alt
...
feat: allow Item image alt
2020-08-12 13:37:58 +05:30
Marica
846771cb29
Merge branch 'develop' into item-image-alt
2020-08-12 13:37:19 +05:30
Deepesh Garg
1d5ab618d2
Merge pull request #23001 from nabinhait/inclusive-tax-based-on-item-quantity
...
fix: Calculate taxes if tax is based on item quantity and inclusive on item price
2020-08-11 22:05:02 +05:30
Deepesh Garg
7d0a625b9c
git commit -m "fix: Add missing semicolon"
2020-08-11 22:02:12 +05:30
Marica
f6e9888aa4
Merge pull request #23000 from AfshanKhan/fix-duplicate-dropdown-PO
...
fix: po dropdown
2020-08-11 20:35:28 +05:30
Nabin Hait
19ea7218d9
fix: Calculate taxes if tax is based on item quantity and inclusive on item price
2020-08-11 20:34:57 +05:30
Shivam Mishra
1679c7af88
Merge branch 'develop' into support-search
2020-08-11 14:54:10 +00:00
Afshan
ba33900712
Merge remote-tracking branch 'upstream/develop' into fix-duplicate-dropdown-PO
2020-08-11 20:17:05 +05:30
Afshan
b5b2586968
fix: referencing frm
2020-08-11 20:15:57 +05:30
Shivam Mishra
2fe5d76fe4
Merge branch 'develop' into item-image-alt
2020-08-11 14:45:55 +00:00
Shivam Mishra
ccdaf3da66
Merge branch 'develop' into fix-margin-for-filter
2020-08-11 14:41:29 +00:00
Deepesh Garg
ca9038feb7
Merge pull request #22998 from abhishekbalam/rename_source_section_opportunity
...
fix(CRM): Change 'Source' section name to 'More Information' in Opportunity
2020-08-11 18:26:09 +05:30
Anurag Mishra
ed6e9550ca
fix: removed payroll from HR. ( #22991 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-08-11 18:04:42 +05:30
Deepesh Garg
2633e292a5
fix: Is Secured Loan check mapping
2020-08-11 18:03:28 +05:30
Abhishek Balam
d0ae92d4bd
fix: moved company field, renamed to 'More Information'
2020-08-11 17:39:17 +05:30
prssanna
5a7618d8ec
fix: add company in list fields to fetch for Expense Claim
2020-08-11 16:50:31 +05:30
Abhishek Balam
ee5b9c7691
feat(Accounting): Process Statement Of Accounts ( #22901 )
...
* feat: Process Statement Of Accounts initial commit
* fix: add jinja supported inputs for subject and body in email settings
* feat: utils support in template, tested autoemail, fixed issues
2020-08-11 16:23:47 +05:30
Abhishek Balam
9f6d114265
fix: Change Source section name to 'Company Information'
2020-08-11 16:16:05 +05:30
Anupam Kumar
79d731dcd8
feat: Naming series for Sales/Purchase Return ( #22942 )
...
* feat: adding return naming series
* Update purchase_invoice.json
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-08-11 16:11:20 +05:30
Deepesh Garg
145b80b11c
Merge pull request #22987 from frappe/fix-company-field
...
fix: Consistent capitalization
2020-08-11 16:09:27 +05:30
Deepesh Garg
2621016884
fix: Allocated advance amount for multi-currency payment ( #22923 )
...
* fix: Allocated advance amount for multicurrency payment
* fix: Get grand total based on party currency
* fix: Remove unwanted code
2020-08-11 16:06:13 +05:30
Abhishek Balam
ef3b82dae2
fix(CRM): Move Source section above Follow Up section In Opportunity ( #22974 )
...
* fix: move source section above follow up
* fix: only moving source field to 1st section
2020-08-11 16:05:02 +05:30
Shivam Mishra
3325be1d87
fix: spacing for slideshow ( #22996 )
2020-08-11 16:03:46 +05:30
Deepesh Garg
285e059394
Merge pull request #22997 from abhishekbalam/set_opportunity_status_to_converted
...
fix(CRM): Change Opportunity to 'Converted' when Sales Order is created
2020-08-11 16:00:16 +05:30
Abhishek Balam
c992616d35
fix: change opportunity to 'Converted' when items not selected in opportunity itself for making quotation and sales order
2020-08-11 15:22:54 +05:30
Shivam Mishra
c798c6abbd
Merge branch 'develop' into fix-margin-for-filter
2020-08-11 09:11:30 +00:00
Afshan
acc3d42cf0
fix: escape apostrophe in company name if exist ( #22956 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-08-11 14:40:44 +05:30
Shivam Mishra
49dd8782fd
fix: margin overflow cutting the focus state
2020-08-11 14:39:04 +05:30
Rucha Mahabal
19b51762ef
fix: escape fields for Payroll Entry ( #22994 )
2020-08-11 13:12:00 +05:30
Rucha Mahabal
b7bc34047a
Merge pull request #22947 from ruchamahabal/escape-company-field
...
fix: escape company field
2020-08-11 10:58:56 +05:30
Rucha Mahabal
f7a7cc08d9
Merge branch 'develop' into escape-company-field
2020-08-11 10:22:32 +05:30
Saurabh
58d05ac0e0
fix: check setup complete flag insted setup page
2020-08-10 19:36:45 +05:30
Jai Chavan
dbbb864ba5
fix: Consistent capitalization
2020-08-10 16:55:03 +05:30
Deepesh Garg
372abaa420
Merge pull request #22976 from marination/sales-taxes-dashboard
...
fix: Susbcription in Sales Taxes and Charges Dashboard
2020-08-10 15:17:59 +05:30
marination
0f27500197
fix: Susbcription in Sales Taxes and Charges Dashboard
2020-08-10 15:17:58 +05:30
Saurabh
2547b7479e
Merge pull request #22975 from nextchamp-saqib/pos-fixes-1
...
fix: [pos] minor bugs
2020-08-10 14:50:53 +05:30
Marica
0fcb05a3aa
fix: Misleading filters on Item tax Template Link field ( #22918 )
...
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-08-10 14:48:13 +05:30
Saqib Ansari
f1091534cd
fix: [pos] minor bugs
2020-08-10 14:45:58 +05:30
Deepesh Garg
61538f23f0
Merge pull request #22971 from marination/opportunity-from-email
...
fix: Creating opportunity from email
2020-08-10 14:26:05 +05:30
Marica
42fbdc09f8
Merge branch 'develop' into opportunity-from-email
2020-08-10 13:48:43 +05:30
Anoop
d3d3db654e
fix: Inpatient Record - Transfer check-in time validation ( #22958 )
...
* fix: inpatient transfer should not allow future checkin time
* Update erpnext/healthcare/doctype/inpatient_record/inpatient_record.js
Error message corrected
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-08-10 13:21:12 +05:30
Rucha Mahabal
520bb6ac74
Merge pull request #22970 from ruchamahabal/fix-fees-test
...
fix: failing Fees test
2020-08-10 12:54:22 +05:30
Shivam Mishra
ded9f41cce
refactor: update confusing label
2020-08-10 12:45:07 +05:30
marination
a07973cfa5
fix: Creating opportunity from email
2020-08-10 12:39:42 +05:30
Anurag Mishra
95984fd921
fix: Not able to cancel application,allocation nad encashments
2020-08-10 12:36:00 +05:30
Rucha Mahabal
97ecf52d6f
fix: failing Fees test
2020-08-10 12:13:35 +05:30