CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-29 17:11:33 +02:00
Code Issues Packages Projects Releases Wiki Activity
38,393 Commits 438 Branches 1,726 Tags
fe4540d74d0dfda170c2a781347d745fb9f86fb6
Commit Graph

38393 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
sahil28297
4e4a19d3e6 Merge pull request #22984 from saurabh6790/tax-template-issue 
fix: Susbcription in Sales Taxes and Charges Dashboard
 2020-08-10 16:01:35 +05:30
Deepesh Garg
069a54e5c3 fix: Cancellation of accounting transactions within closed accounting period 2020-08-10 16:01:01 +05:30
sahil28297
8aeb20cab8 Merge pull request #22977 from sahil28297/fix_pos_isse_v13 
fix: remove mentions of display items in stock (#22963)
 2020-08-10 16:00:56 +05:30
sahil28297
e5e0e93229 Merge pull request #22978 from sahil28297/fix_pos_isse_v13 
Fix pos isse v13
 2020-08-10 16:00:36 +05:30
sahil28297
81e35f67be Merge pull request #22979 from saurabh6790/pos 
fix: [pos] minor bugs
 2020-08-10 16:00:20 +05:30
sahil28297
e183161158 Merge pull request #22980 from sahil28297/sub_dashboard_link_v13 
fix: Subscripition link in Customer dashboard (#22960)
 2020-08-10 15:59:58 +05:30
sahil28297
4ace0829b9 Merge pull request #22983 from saurabh6790/pos 
Pos
 2020-08-10 15:59:39 +05:30
sahil28297
e204f152b3 Merge pull request #22981 from sahil28297/sub_dashboard_link_v13 
Sub dashboard link v13
 2020-08-10 15:59:16 +05:30
sahil28297
b42e268d1b Merge pull request #22982 from saurabh6790/tax-template-issue 
fix: Susbcription in Sales Taxes and Charges Dashboard
 2020-08-10 15:58:58 +05:30
marination
3beeeb589a fix: Susbcription in Sales Taxes and Charges Dashboard 2020-08-10 15:55:02 +05:30
Deepesh Garg
b1e2cdd4d2 fix: Subscripition link in Customer dashboard (#22960) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2020-08-10 15:53:29 +05:30
Saqib Ansari
cc5b49bff4 fix: [pos] minor bugs 2020-08-10 15:52:32 +05:30
Mangesh-Khairnar
9305e7f1cc fix: remove mentions of display items in stock (#22963) 2020-08-10 15:48:33 +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
Deepesh Garg
d626e3bd2e Merge branch 'develop' into billing_address_fetch 2020-08-10 12:57: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
Prssanna Desai
5c0439f768 fix: set correct default value from from date in downtime analysis report (#22903) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2020-08-10 11:12:52 +05:30
Deepesh Garg
bc8a281f83 fix: Subscripition link in Customer dashboard (#22960) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2020-08-10 11:00:08 +05:30
Deepesh Garg
41a4999711 Merge pull request #22843 from nextchamp-saqib/asset-adj-dimension-fix 
fix: cannot submit value adjustment with custom dimension
 2020-08-10 10:12:41 +05:30
Deepesh Garg
097d89f550 Merge pull request #22946 from deepeshgarg007/gst_export_wopay 
fix: GSTR 1 report for exports without payment of Tax
 2020-08-10 09:56:12 +05:30
Anupam K
d01caac852 report lead detail 2020-08-10 09:39:58 +05:30
Raffael Meyer
821eeb9852 fix(membership): currency should be a link 2020-08-09 14:07:32 +02:00
Mangesh-Khairnar
a53f15ca35 fix: remove mentions of display items in stock (#22963) 2020-08-09 13:12:47 +05:30
Deepesh Garg
7882c70244 Merge pull request #22959 from deepeshgarg007/gst_rcm_fixes_v13 
fix: Taxable value for RCM
 2020-08-08 22:34:36 +05:30