Deepesh Garg
6f29f67a83
Merge pull request #24667 from pateljannat/gstr-1-unidentified-accounts-issue
...
fix: excluding unidentified accounts from gstr-1
2021-02-20 17:27:56 +05:30
Michelle Alva
43f126ed13
fix: Typo in Leave Application
...
Change "Leaves" to "Leave"
2021-02-20 10:46:22 +05:30
Michelle Alva
ab149f196e
fix: typo in Leave Balance Report
...
Change Leaves to Leave
2021-02-20 10:43:47 +05:30
rohitwaghchaure
1aad27a539
Merge pull request #24612 from rohitwaghchaure/fixed-validation-for-job-card
...
fix: [minor] validation of job card in stock entry
2021-02-19 21:22:57 +05:30
Saqib Ansari
8c7c682f17
chore: make parameter group optional
2021-02-19 20:35:23 +05:30
Deepesh Garg
6a5ef261f2
feat: Normal rounding for GST Taxes ( #24488 )
...
* feat: Normal rounding for GST Taxes
* fix: Add test case
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-02-19 14:30:23 +05:30
Deepesh Garg
811ff5c397
Merge pull request #24669 from deepeshgarg007/transaction_delete_fix
...
fix: Do not delete GST Accounts from GST Settings on clearing transactions from Company Master
2021-02-19 10:54:56 +05:30
Deepesh Garg
7efbbcf3aa
fix: Do not delete GST Accounts from GST Settings on clearing transactions from Company Master
2021-02-19 10:53:58 +05:30
Deepesh Garg
bc857522ad
fix: Loan Interest Accrual Chart
2021-02-19 10:13:56 +05:30
pateljannat
4858b40813
fix: excluding unidentified accounts from gstr-1
2021-02-18 18:44:29 +05:30
Marica
77d72d59ef
Merge branch 'develop' into quality-inspection-parameter-group
2021-02-18 16:55:44 +05:30
Marica
f3ca4bcb70
Merge branch 'develop' into rfq-contact-email-set
2021-02-18 16:51:50 +05:30
Rucha Mahabal
ccc80927f6
feat: Department Wise Appointment Type charges ( #24572 )
...
* feat: Appointment Type Service Items
Co-Authored-By: muhammad <muhammadmp@users.noreply.github.com>
* fix: set practitioner service item charges mandatory on item selection
Co-Authored-By: muhammad <muhammadmp@users.noreply.github.com>
* feat: use charges from appointment type during billing
* feat: handle appointment charges priority for invoice automation
* test: patient appointment auto invoicing scenarios
* fix: sider
* fix: minor fixes
Co-authored-by: muhammad <muhammadmp@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-02-18 16:41:10 +05:30
Raffael Meyer
d44e60f17c
feat: add Print Language to Lead and Opportunity ( #24317 )
...
* fix: move "Print Language" to "More Information"
* feat: add "Print Language" in "More Information"
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-02-18 16:24:37 +05:30
Rucha Mahabal
e7bf87cc84
fix: POS return for Serialized Items ( #24292 )
...
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2021-02-18 16:04:35 +05:30
Jannat Patel
ef5c714de2
fix: salary slip attribute error ( #24455 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-02-18 15:52:29 +05:30
Rohit Waghchaure
c697cb8b2d
fix: validation of job card in stock entry
2021-02-18 15:10:12 +05:30
Nabin Hait
d826bee13a
fix: update qty in future sle ( #24649 )
...
* fix: update qty in future sle
* fix: validate cancellation due to ongoing reposting
* fix: process sle against current timestamp
2021-02-18 14:14:21 +05:30
Deepesh Garg
c5b94adc87
Merge pull request #24651 from ankush/ignore_gl_while_cancelling_so
...
fix(selling): cancel sales order with cancelled PE
2021-02-17 18:39:35 +05:30
rohitwaghchaure
03a1484aed
Merge pull request #24621 from rohitwaghchaure/fixed-consolidated-report-not-working-develop
...
fix: Consolidated Financial Statement report not works if child compa…
2021-02-17 16:35:43 +05:30
Marica
208d1942c3
Merge branch 'develop' into quality-inspection-parameter-group
2021-02-17 12:56:35 +05:30
Marica
7de7bb5202
Merge branch 'develop' into item_group_on_update_items
2021-02-16 23:06:20 +05:30
Marica
4441cebbb3
Merge branch 'develop' into shopping-cart
2021-02-16 20:55:00 +05:30
Ankush Menat
3f16902b00
fix(selling): cancel sales order with cancelled PE
...
Allow cancelling sales order with cancelled payment entry. Ignoring GL
entries while cancelling the document is required to cancel it, reverse
entries are created by accounts controller.
Related issue: ISS-20-21-09586
2021-02-16 18:53:40 +05:30
Ankush Menat
f9d4d9a095
test(selling): add test for cancelling sales order
...
Add failing test to reproduce bug in cancelling sales order with advance
payments
Related issue: ISS-20-21-09586
2021-02-16 18:45:39 +05:30
prssanna
9c36dc3798
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2021-02-16 16:17:32 +05:30
prssanna
7166b6740f
fix: duplicate css property
2021-02-16 16:17:17 +05:30
Nabin Hait
9b178bcd10
fix: stock and account balance syncing ( #24644 )
...
* fix: stock and account balance syncing
* fix: stock and account balance syncing
* fix: stock and account balance syncing
* fix: minor fix
2021-02-16 14:57:00 +05:30
prssanna
7e8113c7e8
fix: broken image style
2021-02-16 12:00:35 +05:30
Rohit Waghchaure
9a40c1b2e1
fix: patch
2021-02-16 10:35:10 +05:30
rohitwaghchaure
d60ff83b6f
fix: added patch to fix incorrect stock qty and account value ( #24628 )
2021-02-16 09:12:27 +05:30
Deepesh Garg
79f63526cb
Merge pull request #24632 from ankush/ladakh_gst_addition
...
fix(India): Add GST state code for Ladakh
2021-02-15 21:11:54 +05:30
Deepesh Garg
e2324c77fe
fix: Test Cases
2021-02-15 20:01:32 +05:30
Nabin Hait
243661b37b
fix: formatting query args ( #24627 )
2021-02-15 19:27:49 +05:30
Rushabh Mehta
8cc6a2d62c
fix(typo): erpnext-logo.png
2021-02-15 17:40:50 +05:30
Rushabh Mehta
b0735732f9
fix(minor): add erpnext-logo.png
2021-02-15 17:38:55 +05:30
Deepesh Garg
df4eed4c0d
Merge pull request #24615 from ruchamahabal/packed-item-fixes_v13
...
fix: Issues with packing items
2021-02-15 16:44:10 +05:30
Deepesh Garg
47f5f4757a
Merge branch 'develop' into fixed-consolidated-report-not-working-develop
2021-02-15 16:35:31 +05:30
Deepesh Garg
b6cd97e5fc
Merge pull request #24320 from pateljannat/ldc-validations
...
fix: validation for ldc against supplier and section code
2021-02-15 16:33:41 +05:30
Deepesh Garg
535dc4aea2
fix: Do not round off per day interest
2021-02-15 15:54:25 +05:30
Ankush Menat
57c3d373a7
fix(India): Add GST state code for Ladakh
2021-02-15 15:03:50 +05:30
Afshan
e963362dfd
fix: check if customer provided item while setting opening stock
2021-02-15 15:00:37 +05:30
Deepesh Garg
429fb3bba8
Merge branch 'develop' of https://github.com/frappe/erpnext into loan_exposure_report_fix
2021-02-15 14:10:10 +05:30
Deepesh Garg
9bf05ad927
feat: Loans Dashboard
2021-02-15 13:32:50 +05:30
Richard Case
fd4e7bdbb1
fix: plaid client version to support latest API ( #24531 )
2021-02-15 11:58:27 +05:30
Marica
45db1c5d74
Merge branch 'develop' into shopping-cart
2021-02-15 10:35:05 +05:30
rohitwaghchaure
164ffac4ef
fix: Consolidated Financial Statement report not works if child company account not present in parent company ( #24580 )
...
Fixed conflicts
2021-02-12 17:33:07 +05:30
Nabin Hait
85252e7aef
Merge branch 'develop' into packed-item-fixes_v13
2021-02-12 12:39:38 +05:30
Afshan
c44d6b9546
fix: NoneType object has no attribute len() ( #24616 )
2021-02-12 12:24:41 +05:30
Marica
87fcae4efd
Merge branch 'develop' into shopping-cart
2021-02-12 12:16:13 +05:30
Rucha Mahabal
ad1f2b41f4
fix: Issues with packing items
2021-02-12 11:29:24 +05:30
Saqib Ansari
138e98fef2
Merge branch 'develop' into quality-inspection-parameter-group
2021-02-12 11:19:25 +05:30
Nabin Hait
1e6cce3593
Merge branch 'develop' into item_group_on_update_items
2021-02-11 21:59:38 +05:30
Jannat Patel
bb0d8f8038
Update accounts_controller.py
2021-02-11 20:59:28 +05:30
Anupam Kumar
7e1dcf911d
feat: capture Rate of stock UOM in purchase ( #24315 )
...
* feat: capture Rate of stock UOM in purchase
* fix: review changes
* added server side code
* added stock uom rate in sales transactions
* fix: review changes
* fix: resolving conflicts
* adding patch
* fix: removing patch
2021-02-11 20:19:30 +05:30
Afshan
ee87484134
fix: calculated discount percentage ( #24510 )
...
* fix: calculated discount percentage
* fix: slider
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-02-11 20:11:58 +05:30
Jannat Patel
0a7939277c
fix: dynamic links for reports ( #24462 )
...
* fix: dynamic links for reports
* fix: revert changes for payment period report
* fix: link doctypes
2021-02-11 20:11:06 +05:30
marination
e2d0715cdf
fix: Server side validation for missing payment gateway account
2021-02-11 19:06:10 +05:30
marination
8615227090
fix: Shopping cart breaks without Payment Gateway Account
2021-02-11 18:51:35 +05:30
Saqib
f25ab6f826
fix: validate cancellation only if irn generated ( #24608 )
2021-02-11 17:50:57 +05:30
Jannat Patel
6756d3b561
Merge branch 'develop' into item_group_on_update_items
2021-02-11 16:29:34 +05:30
Marica
819b8d0266
Merge branch 'develop' into rfq-contact-email-set
2021-02-11 14:45:09 +05:30
Saqib
0681a480c2
feat(pos): mpesa related fixes & additions ( #24306 )
...
* fix: switching of mode of payments
* feat: transaction limit for mpesa integration
* feat: resend payment request if one fails
* feat: make new request only for failed ones
* fix: invalid amount for mpesa request
* fix: payment successful message not shown
* fix: url and business shortcode for live env
* fix: duplicate items validation for pos invoices
* fix: pos closing entry queued status
* fix: peroid end date for amended pos closing
2021-02-11 14:06:15 +05:30
Shariq Ansari
a46a83b476
fix: Assignment Rule Unassign Condition doesn't work ( #24551 )
...
Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-02-11 13:41:10 +05:30
Nabin Hait
aa235b36e0
Update erpnext/controllers/accounts_controller.py
...
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2021-02-11 13:26:53 +05:30
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
e07eb86498
Merge branch 'develop' into tcs_calculation
2021-02-11 12:13:47 +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
Nabin Hait
9d3f242f39
Update subscription.js
2021-02-11 11:17:33 +05:30
Nabin Hait
b58b8ec2fb
Merge branch 'develop' into quality-inspection-parameter-group
2021-02-11 11:14:02 +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
Nabin Hait
79ba299abc
Merge branch 'develop' into subscription_fix_new
2021-02-11 11:03:45 +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
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
pateljannat
1ab95413be
fix: conditions simplified
2021-02-09 17:35:17 +05:30
Deepesh Garg
516b3ae1bc
fix: get company attribute
2021-02-09 16:47:55 +05:30
Deepesh Garg
45cec6928b
fix: get company attribute
2021-02-09 16:44:12 +05:30
Deepesh Garg
5006a2065e
fix: Comment
2021-02-09 16:38:11 +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
pateljannat
637ddff6e9
fix: code cleanup
2021-02-09 16:17:30 +05:30
Deepesh Garg
e56daeb347
fix: Multiple fixes in subscription
2021-02-09 16:13:45 +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
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
Saqib Ansari
8c3da162ba
feat: introduce parameter group in quality inspection
2021-02-04 19:39:41 +05:30
Saqib
0f2dc0eb73
Merge branch 'develop' into tcs_calculation
2021-02-04 18:38:26 +05:30
Deepesh Garg
dce73d1881
fix: Add accounts user role permission for accounting dimension filter
2021-02-03 12:06:36 +05:30
pateljannat
0701f08ab6
fix: item_group on update items
2021-02-03 11:53:14 +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
Afshan
91a02868cb
fix: emp disappear ( #24525 )
...
* fix: emp disappear
* fix: renamed set_totals_call to set_totals
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-02-02 11:04:25 +05:30
Suraj Shetty
54a253616a
Merge pull request #24508 from frappe/rebrand-ui
2021-02-02 09:07:35 +05:30
Rohit Waghchaure
d4d639c7ed
fix: test cases for pricing rule
2021-02-01 23:01:18 +05:30
Suraj Shetty
d809de6579
Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui
2021-02-01 22:40:46 +05:30
Suraj Shetty
852e67c5ee
fix(patch): Use db_set to ignore validation
2021-02-01 22:40:40 +05:30
prssanna
6f1664223d
style: missing semicolon
2021-02-01 20:43:30 +05:30
prssanna
44a055b52f
Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui
2021-02-01 20:39:20 +05:30
Marica
0ea2587679
fix: Numeric/Non-numeric QI UX ( #24516 )
...
* chore: Show 1 field each of both types of Insoections in grid view
* fix: Make QI check Numeric by default and make checkbox "Numeric"
- Reducing cognitive load
2021-02-01 20:38:53 +05:30
prssanna
73d60aa498
style: fix formatting
2021-02-01 20:38:17 +05:30
Suraj Shetty
cfb5f58141
style: Fix formatting issues
2021-02-01 20:37:18 +05:30
Saurabh
9dcb286c31
fix: consider select perm while setting party details ( #24518 )
2021-02-01 20:36:15 +05:30
Suraj Shetty
723bd9676d
style: Fix formatting issues
2021-02-01 20:34:21 +05:30
prssanna
62442d1c52
style: fix formatting
2021-02-01 20:26:09 +05:30
rohitwaghchaure
bf7317d4e2
fix: multiple pricing rule issue ( #24509 )
2021-02-01 20:22:14 +05:30
prssanna
9a69c0e21e
Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui
2021-02-01 20:13:01 +05:30
prssanna
526ea46ae2
fix: formatting issues
2021-02-01 20:12:47 +05:30
Suraj Shetty
159063db29
Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui
2021-02-01 20:09:58 +05:30
Suraj Shetty
f57efd1150
style: Fix invalid translation syntax usages
2021-02-01 20:09:20 +05:30
Marica
fb016edb7a
chore: Use sql to set naming series in older projects ( #24512 )
...
* chore: Use sql to set naming series in older projects
* fix: Remove unncessary db.commit()
2021-02-01 20:05:29 +05:30
prssanna
53225f5cbb
Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui
2021-02-01 20:01:54 +05:30
prssanna
11eae6d51a
fix: add default product-image css class
2021-02-01 20:01:37 +05:30
Suraj Shetty
8fef3a3814
Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui
2021-02-01 19:52:12 +05:30
Suraj Shetty
1ab79da7d1
style: Fix formatting issues
2021-02-01 19:51:25 +05:30
prssanna
ba54c4f1b3
Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui
2021-02-01 19:50:46 +05:30
prssanna
a3585e40f7
style: fix formatting
2021-02-01 19:50:27 +05:30
Suraj Shetty
8030abe1bd
Merge branches 'rebrand-ui' and 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui
2021-02-01 19:41:03 +05:30
Suraj Shetty
f67bf7ae98
chore: Fix formatting issues
2021-02-01 19:40:44 +05:30
prssanna
1d346702ed
chore: add .stylelintrc file
2021-02-01 19:07:32 +05:30
prssanna
7863118994
fix: docs link for store page in shopping cart settings
2021-02-01 18:57:30 +05:30
Saqib Ansari
cee3670167
chore: clean up sales invoice form
2021-02-01 15:45:26 +05:30
Suraj Shetty
13d48a0c20
Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui
2021-02-01 15:11:07 +05:30
Suraj Shetty
055b81da7b
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2021-02-01 15:10:52 +05:30
Saqib
beebaf6e1e
refactor: assets form cleanup with rebrand ui ( #24494 )
2021-02-01 11:22:57 +05:30
Deepesh Garg
ab88ec208e
fix: Error handling in loan reports
2021-01-31 12:31:46 +05:30
prssanna
2aebf99968
fix: add removed get_employee_emails function
2021-01-29 15:55:21 +05:30
Saqib
fb75f0935f
Merge branch 'develop' into tcs_calculation
2021-01-29 14:26:48 +05:30
Saqib
77d5f59376
fix: discount amount calculation on net total ( #24497 )
2021-01-29 14:24:08 +05:30
rohitwaghchaure
cf3e0cf271
Merge pull request #24365 from rohitwaghchaure/fixed-extra-trasnferred_qty_issue-develop
...
fix: extra transferred qty has not consumed against work order
2021-01-29 12:28:28 +05:30
Saqib Ansari
3b2327ba8d
fix: sider
2021-01-29 12:08:35 +05:30
Suraj Shetty
0a8939e1c1
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2021-01-29 08:56:22 +05:30
Deepesh Garg
7e3f5e04ab
fix: LTV ration in interest report
2021-01-28 23:25:23 +05:30
Saqib
675a8330a4
refactor: POS Invoice merging and cancellation ( #24351 )
...
* feat: pos invoice merging with background jobs
* fix: invoice threshold for queueing job
* refactor: cancellation flow of point of sale
* feat: tests for cancellation of pos closing
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2021-01-28 18:42:43 +05:30
leela
3234df5581
feat: improved call log doctype
...
* Added links and some more fields into Call Log Doctype
* Display call info in the call log link pages
2021-01-28 18:34:58 +05:30
Saqib
62dfff5dde
Merge branch 'develop' into tcs_calculation
2021-01-28 18:08:13 +05:30
Saqib Ansari
4d9b6066a2
fix: tcs amount calculation
2021-01-28 18:07:08 +05:30
Saqib
ac9e6ff704
fix(pos): multiple pos fixes and additions ( #24227 )
...
* fix: make custom fields in pos invoice similar to sales invoice
* feat: allow/disallow rate & discount change
* fix: any pos profile can be selected while creating pos opening
* fix: cannot add item to cart
* fix: validate phone payment only if payment request exists
* fix: replace pos payment method patch
* chore: rearrange item & customer group filter
* fix: allow/disallow invoice level discount
* fix: updating qty of item with uom having space char
* fix: move configuration checbox to config section
* fix: invalid item rate trigger
* fix: cannot remove item from draft invoices
* fix: customer currency not set in pos invoice
* fix: duplicate item error message
* fix: sales uom not fetched in pos invoice
* fix: cannot add taxes to pos invoice for uae region
* fix: cannot merge pos invoice into credit note
* fix: tax calculation while merging pos invoices
* feat: delete draft orders from order list
* fix: merging of pos invoice with pricing rules
2021-01-28 17:58:55 +05:30
Anupam Kumar
0d9a8ae4d2
feat: shopping portal changes ( #24445 )
...
* feat: shopping portal changes
* fix: review changes
* review changes
2021-01-28 17:32:57 +05:30
Anupam
e6f925e5e6
review changes
2021-01-28 15:58:03 +05:30
Marica
56c6805d79
Merge branch 'develop' into fixed-extra-trasnferred_qty_issue-develop
2021-01-28 15:03:15 +05:30
Marica
9580adad0c
Merge branch 'develop' into project-naming-series-patch
2021-01-28 14:32:11 +05:30
Marica
7aa16bafff
Merge branch 'develop' into lcv_multicurrency
2021-01-28 13:29:36 +05:30
Deepesh Garg
b4be292217
fix: Item valuation for internal stock transfers ( #24200 )
...
* fix: Item valuation for internal stocktransfers
* fix: Consider conversion factor for invoices
* fix: Add missing set warehouse fields
* fix: Add validations and other fixes
* fix: Fixes in flow
* fix: Internal sales item link in Purchase Invoice
* fix: Debugging
* fix: Debug travis
* fix: Remove commented code
* fix: Rate forcing in sales order
* fix: Unreallized profit in Sales Register
* fix: Item wise gst sales register fix
* fix: From warehouse in Purchase Order
* fix: Target field in Sales Invoice
* fix: remove self
* fix: GST Purchasse register and other fixes
* fix: Add shipping_address to no field map
* fix: Ref doc map
* fix: Test Cases
* fix: address mapping between sales and purchase document
* fix: Import Error
* fix: Tax updation for internal invoices
* fix: Purchase Order and Invoice linking
* fix: Internal Party validation fix
* fix: validation
* fix(india): GST Taxes for intra state transfer
* fix(india): GST Taxes for intra state transfer
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-01-28 13:09:56 +05:30
Marica
465974cff0
Merge branch 'develop' into project-naming-series-patch
2021-01-28 13:01:28 +05:30
Marica
ed6368d782
Merge pull request #24481 from marination/stock-entry-indicator
...
chore: Set Stock Entry Form Indicators in setup
2021-01-28 13:00:24 +05:30
Marica
9e11521764
Merge pull request #24466 from marination/stock-entry-qi
...
fix: Always show QI Template in Item
2021-01-28 12:45:49 +05:30
Mohamed Almubarak
f7ea340181
fix(template): cards on second row overlaps the one before ( #23454 )
...
* Update macros.html
fix second row of cards overlapps with the one before
* Update macros.html
fix(template): second row of cards overlaps with the one before
* Update macros.html
fix(template): second row of cards overlaps with the one before
2021-01-28 12:32:13 +05:30
Jannat Patel
9f8cbe9101
Material request wrong status issue ( #24019 )
...
* fix: material request status fix
* fix: changing precision to global defaults for material request status
* fix: adding back the removed flt
* fix: sider issues fixed
Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>
2021-01-28 12:29:52 +05:30
Saqib
8e55677f10
feat: deleting account & stock entries on deletion of transaction ( #24298 )
...
* feat: control for deleting account & stock entries on deletion of a transaction
* chore: change label & fieldname
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-01-28 12:26:45 +05:30
Jannat Patel
3914aca647
fix: check for tax rate ( #24376 )
2021-01-28 12:25:15 +05:30
Anurag Mishra
5756bf50e6
fix: removed all day event from shift assignment calendar ( #24397 )
...
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
2021-01-28 12:24:39 +05:30
Afshan
e5529ad461
fix: validate tax template for tax category ( #24402 )
...
* fix: validate tax template for tax category
* Update sales_taxes_and_charges_template.py
2021-01-28 12:22:39 +05:30
Raffael Meyer
f6f4376463
feat: remove german sales invoice validation ( #24441 )
...
This can be better achieved via Customize Form
(mandatory and mandatory_depends_on)
2021-01-28 12:16:26 +05:30
Marica
cc22814df5
Merge branch 'develop' into lcv_multicurrency
2021-01-28 12:15:09 +05:30
Marica
cdccf4be52
Merge branch 'develop' into stock-entry-qi
2021-01-28 12:12:03 +05:30
Deepesh Garg
16bcd01f6d
feat: Provision to disable serial no and batch selector ( #24398 )
...
* feat: feat: Provision to disbale serial no and batch selector
* fix: Sider issues
* fix: Linting issues
2021-01-28 12:09:35 +05:30
Deepesh Garg
bd9bdc5797
feat: Batch wise item pricing ( #24470 )
...
* feat: Batch wise item pricing
* fix: Rate for items with no batch
* fix: Add test case for batch pricing
* fix: Sider Issues
* fix: Add item filter for batch
2021-01-28 12:05:57 +05:30
marination
27bac2aaec
fix: Missing semi-colon
2021-01-28 12:04:14 +05:30
pateljannat
55e7c5644c
fix:rfq contact email set
2021-01-28 12:00:18 +05:30
marination
bc370b3ee5
chore: Set Stock Entry Form Indicators in setup
...
- Makes it easier to override via customisations
- Style consistency with other forms that set indicator in setup as well
2021-01-28 11:44:26 +05:30
Marica
ea7c2dbfaf
Merge branch 'develop' into stock-entry-qi
2021-01-28 11:31:43 +05:30
Saqib
31eb740aef
Merge branch 'develop' into tcs_calculation
2021-01-27 19:47:19 +05:30
Saqib Ansari
ae9a9a2167
fix: tcs chargable amount
2021-01-27 19:36:29 +05:30
Saqib Ansari
ff12f91486
feat: charging tcs on sales invoice
2021-01-27 19:17:38 +05:30
prssanna
74feaf85dc
fix: website order page style
2021-01-27 17:41:15 +05:30
Saqib Ansari
6db14d02d2
fix: test
2021-01-27 17:11:34 +05:30
