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

34427 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marica
a5039e8f85
Merge branch 'develop' into rfq-contact-email-set 2021-02-11 13:23:56 +05:30
Shariq Ansari
47f784aa9c
fix: Lead not getting linked to call logs (#24593) 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-02-11 13:23:51 +05:30
rohitwaghchaure
aa00eb9898
fix: reposting issue with same posting date and posting time (#24570) 
* fix: reposting issue with same posting date and posting time

* Update erpnext/stock/stock_ledger.py

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-02-11 13:23:01 +05:30
Saqib
e37a5c2646
fix: customer_currency referenced before assignment (#24607) 2021-02-11 13:10:52 +05:30
Saqib
15f4672ffa
fix: pos closing valdation (#24605) 2021-02-11 12:11:44 +05:30
Jannat Patel
30c8873f24
fix: validation for disabled warehouse (#24539) 
* fix: validation for disabled warehouse

* fix: better function name

* fix: validation in stock ledger entry
 2021-02-11 11:46:48 +05:30
Kanchan Chauhan
bb05acb60d
fix(Leave Application): List view fix (#24550) 2021-02-11 11:18:59 +05:30
Anupam Kumar
e816ed89e6
fix: portal permission issue (#24577) 2021-02-11 11:12:13 +05:30
Anuja Pawar
e3c72a3d71
fix: fix filters for the report (#24594) 2021-02-11 11:06:12 +05:30
Afshan
8609d31430
fix: amend cancelled job offer (#24589) 2021-02-11 11:05:48 +05:30
Ankush Menat
df6e20887d
fix: update total in words after updating items (#24602) 
* fix: Update total in words after Updating items

Update total in words after Updating items in sales/purchase orders.
Port of #24592

Closes ISS-20-21-09425

* test: Add test for total & words after update item

Add test for total & words after updating items in sales order.
 2021-02-11 11:04:39 +05:30
Suraj Shetty
969d37da4c
Merge pull request #24598 from surajshetty3416/fix-favicon 2021-02-10 22:18:10 +05:30
Saqib
7b2afaf349
fix: NoneType has no len() (#24600) 2021-02-10 17:21:12 +05:30
Prssanna Desai
161e3954a8
Merge branch 'develop' into fix-favicon 2021-02-10 16:37:13 +05:30
Rucha Mahabal
3237f5bb88
fix: Inpatient Medication Orders report test (#24596) 2021-02-10 16:36:49 +05:30
Prssanna Desai
a751b6bb7a
Merge pull request #24599 from frappe/product-query-fix 
fix: also fetch item variants if hide variants is disabled
 2021-02-10 16:36:40 +05:30
prssanna
fd0e8a4e23 fix: also fetch item variants if hide variants is disabled 2021-02-10 16:31:41 +05:30
Suraj Shetty
5f27c9e100 chore: Remove unnecessary image files 2021-02-10 15:48:58 +05:30
Suraj Shetty
6fa44fefc3 fix: Use new favicon 2021-02-10 15:48:32 +05:30
Marica
bb87950e96
Merge branch 'develop' into rfq-contact-email-set 2021-02-10 12:02:14 +05:30
Anurag Mishra
5164223b99
fix: error on group by filter (#24587) 
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
 2021-02-09 16:22:28 +05:30
Suraj Shetty
1016ff48fc fix: Create new call popup if call popup does not exists 2021-02-09 12:17:29 +05:30
Marica
6330e20d16
Merge pull request #24565 from marination/stock-dashboard-font-weight 
fix: (ui) Empty State text font weight in Item Dashboard
 2021-02-09 11:03:18 +05:30
Deepesh Garg
236c9ae453
Merge pull request #24578 from marination/acc-dimension-update-fix 
fix: Avoid changing Ref. Doctype in Accounting Dimension after creation
 2021-02-09 06:51:58 +05:30
Suraj Shetty
fbc3988037
Merge pull request #24581 from surajshetty3416/fix-telephony 2021-02-08 20:27:04 +05:30
Saqib
8991d4ed0b
fix: fetching of standalone cr/dr notes for reconciliation (#24575) 2021-02-08 20:19:11 +05:30
Suraj Shetty
dcc9947d10 fix: Update call_popup 
- Setup missed & call ended listeners
- Show contacts based on links
 2021-02-08 20:13:23 +05:30
Suraj Shetty
c5248b30eb fix: Do not re-use call popup if call ID is different 2021-02-08 18:50:05 +05:30
Suraj Shetty
ba26020a82 fix: Show audio interface in call log which has recording URL 
- Also, remove unneccesary column & section break in call log doctype
 2021-02-08 18:45:55 +05:30
Suraj Shetty
723e6dd73f fix: Update style of call log shown in timeline 2021-02-08 18:43:26 +05:30
Suraj Shetty
c4d67c2afe refactor: Move call_popup style from less to scss 
- Add style for audio
 2021-02-08 18:42:27 +05:30
marination
5a7ddba9a3 fix: Avoid changing Ref. Doctype in Accounting Dimension after creation 2021-02-08 17:06:23 +05:30
Afshan
53dbe39d12
fix: StopIteration error when e-invoice not enabled (#24548) 
* fix: StopIteration error when e-invoice not enabled

* chore: update message

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-02-08 12:32:42 +05:30
Saqib
9490122abb
fix(e-invoice): skip e-invoice generation for non-taxable invoices (#24568) 2021-02-08 11:40:56 +05:30
Marica
0aef0fd764
Merge branch 'develop' into stock-dashboard-font-weight 2021-02-08 10:34:17 +05:30
marination
a97eb6a052 fix: Empty State text font weight in Item Dashboard 2021-02-07 22:27:40 +05:30
Saqib
f29b811a56
fix(e-invoice): do not validate gstin for exports (#24561) 2021-02-06 17:55:20 +05:30
Anuja Pawar
ffb36aac8f
fix: fixing item_code not found error in the report (#24483) 2021-02-05 23:35:47 +05:30
Nabin Hait
c4a1bb0e1c
fix: couple of travis fixes (#24554) 
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2021-02-05 23:34:18 +05:30
prssanna
4742a25942 Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2021-02-05 17:35:29 +05:30
prssanna
91b41db9e3 fix: check if product_info exists before setting price 2021-02-05 17:34:56 +05:30
Prssanna Desai
ec337f64d9
Merge pull request #24556 from anupamvs/s-c-changes 2021-02-05 17:26:55 +05:30
Anupam
d7f4aefd00 feat: added continue-shopping button on cart 2021-02-05 16:17:20 +05:30
Prssanna Desai
b8f4cdfbce
Merge pull request #24555 from prssanna/product-query-fix 
fix: check if product_info exists
 2021-02-05 14:54:23 +05:30
prssanna
a7820f310c fix: check if product_info exists 2021-02-05 14:52:31 +05:30
Afshan
b814b002ce
fix: creating salary slip from timesheet (#24541) 2021-02-05 11:34:55 +05:30
Deepesh Garg
eff675f45b
Merge pull request #24536 from deepeshgarg007/accounts_user_perm 
fix: Add accounts user role permission for accounting dimension filter
 2021-02-03 12:10:12 +05:30
Deepesh Garg
dce73d1881 fix: Add accounts user role permission for accounting dimension filter 2021-02-03 12:06:36 +05:30
Nabin Hait
7177579051
fix: Dependant sle logic fixes (#24489) 
* fix: Dependant sle logic fixes

* fix: negative qty validation

* fix: Travis fixes
 2021-02-02 22:03:07 +05:30
Anupam Kumar
7d64a291b8
fix: contact permmission issue (#24503) 2021-02-02 12:43:13 +05:30