Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,225 Commits 3 Branches 0 Tags 1 GiB
ccdaf3da66
Commit Graph

32225 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Abhishek Balam
d0ae92d4bd fix: moved company field, renamed to 'More Information' 2020-08-11 17:39:17 +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
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
marination
a07973cfa5 fix: Creating opportunity from email 2020-08-10 12:39:42 +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
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
Deepesh Garg
d4ecf426b7 fix: Place of supply fix 2020-08-08 22:33:18 +05:30
Deepesh Garg
5ac2fd94f0 fix: Taxable value for RCM 2020-08-08 22:28:13 +05:30
Deepesh Garg
72fc188706
Merge pull request #21756 from deepeshgarg007/loan_patch_and_fixes 
fix: Description for fields and patch for old loans
 2020-08-07 17:08:31 +05:30
Deepesh Garg
bad269c354 fix: Parent income account check 2020-08-07 16:21:41 +05:30
Rucha Mahabal
67e54b1c60
Merge pull request #22948 from AfshanKhan/dunning 
fix: grand_total assignment before reference
 2020-08-07 16:12:56 +05:30
Afshan
1f3cc7553c fix: grand_total assigment before reference 2020-08-07 15:57:31 +05:30
Rucha Mahabal
8118dd9e62 fix: escape company field 2020-08-07 14:52:50 +05:30
Deepesh Garg
ab611d5fd8 fix: GSTR 1 report for exports without payment of Tax 2020-08-07 14:47:40 +05:30
Deepesh Garg
b98088bb01
Merge branch 'develop' into loan_patch_and_fixes 2020-08-07 13:27:40 +05:30
Deepesh Garg
4c4c0df7bd
Merge pull request #22939 from frappe/barredterra-patch-1 
fix: show only company's bank accounts
 2020-08-06 20:59:55 +05:30
Shivam Mishra
124eabaac8
Merge branch 'develop' into barredterra-patch-1 2020-08-06 14:16:48 +00:00
Rucha Mahabal
a78336e77d
fix: remove patch for retaining permissions for Video DocType (#22932) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-08-06 19:01:42 +05:30
Raffael Meyer
d854d39c00
fix: show only company's bank accounts 2020-08-06 15:09:22 +02:00