Commit Graph

25427 Commits

Author SHA1 Message Date
Kanchan Chauhan
bb05acb60d
fix(Leave Application): List view fix (#24550) 2021-02-11 11:18:59 +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
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
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
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
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
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
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
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
prssanna
74feaf85dc fix: website order page style 2021-01-27 17:41:15 +05:30
Afshan
907e2990d0
fix: remove function to get earning deduction components (#24465)
* fix: remove function to get earning deduction components

* fix: slider
2021-01-27 15:34:42 +05:30
Saqib
5ba2f58355
fix: e_invoice print format not showing other charges (#24474) 2021-01-27 12:34:08 +05:30
prssanna
2d1d900c88 Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui 2021-01-27 10:58:17 +05:30
prssanna
72053cc4ab fix: cart address overflow 2021-01-27 10:57:34 +05:30
Deepesh Garg
dade7a4583 fix: Translation Syntax 2021-01-26 21:11:55 +05:30
Deepesh Garg
a0d61524c1 fix: Add distribute manually option in LCV 2021-01-26 17:05:00 +05:30
Deepesh Garg
ff3adfd1cf
Merge pull request #24468 from deepeshgarg007/lse_report_fix
fix: Division by 0 error in security exposure reports
2021-01-26 10:13:39 +05:30
Deepesh Garg
7a4db2214a fix: Division by 0 error in security exposure reports 2021-01-26 10:10:35 +05:30
Deepesh Garg
224fdf34e4 Merge branch 'develop' of https://github.com/frappe/erpnext into lcv_multicurrency 2021-01-25 22:16:02 +05:30
Raffael Meyer
1991ba7910
feat: temporary against account (#24086)
* feat: add temporaray against account nmber to datev settings

* feat: use temporary against account in datev report

* test: add temp against account number to test data

* test: include temp against aaccount in filters
2021-01-25 21:22:10 +05:30
Marica
35455d2de6
Merge branch 'develop' into project-naming-series-patch 2021-01-25 21:16:02 +05:30
marination
b0ef8fb7c5 fix: Always show QI Template in Item 2021-01-25 21:00:24 +05:30
rohitwaghchaure
fa3ec3c346
Merge pull request #23969 from marination/putaway
feat: Putaway
2021-01-25 16:42:04 +05:30
Anupam
8541d9738f fix: review changes 2021-01-25 14:18:26 +05:30
Marica
62a1caf6c4
Merge branch 'develop' into lcv_multicurrency 2021-01-25 12:39:16 +05:30
Marica
ec4f42d4a9
Merge branch 'develop' into project-naming-series-patch 2021-01-25 11:29:23 +05:30
Deepesh Garg
164079127f
Merge pull request #24446 from deepeshgarg007/patch-fix-1-new
fix: Project Template patch
2021-01-25 10:37:43 +05:30
Deepesh Garg
befe32cbe1
Merge pull request #24456 from deepeshgarg007/ltv_in_report
fix: Add loan to value field in Loan Interest Report
2021-01-24 19:18:42 +05:30
Deepesh Garg
91eb9bb5c2 fix: Add loan to value field in Loan Interest Report 2021-01-24 19:15:57 +05:30
Kaviya Periyasamy
c680547be3
fix(einvoice): QRCode generation (#24412) 2021-01-24 10:59:37 +05:30
rohitwaghchaure
13df7a0ca6
Merge pull request #24033 from ruchamahabal/patient-history-enhancements
feat: Patient History Enhancements
2021-01-23 18:19:16 +05:30
Rucha Mahabal
ab920b55a7
Merge branch 'develop' into service-units-in-appointment 2021-01-23 13:27:03 +05:30
Rucha Mahabal
edf5da3394
Merge branch 'develop' into patient-history-enhancements 2021-01-23 13:26:36 +05:30
Rucha Mahabal
ee28328006
fix(travis): Issue Analytics Report Test (#24453) 2021-01-23 13:26:24 +05:30
Rucha Mahabal
6f4ad3b73d fix: sider 2021-01-23 12:52:41 +05:30
Rucha Mahabal
cb1da4d07c fix: doctype meta not loading while setting up fields 2021-01-22 19:26:56 +05:30
Marica
6b0d334d25
Merge pull request #24399 from pateljannat/item-wise-purchase-registry-item-name-error
fix: Item wise purchase registry item_name error
2021-01-22 19:20:51 +05:30
Deepesh Garg
5b4ece5054 fix: Update patch 2021-01-22 17:12:35 +05:30
marination
7ba60570e7 fix: Spaces to Tabs 2021-01-22 16:55:06 +05:30
marination
c908deea61 fix: Patch to Add Naming Series to old projects 2021-01-22 16:10:01 +05:30
Rucha Mahabal
75a93d9057 feat: fetch date field for custom doctypes 2021-01-22 15:51:25 +05:30
Afshan
217440952f fix: slider 2021-01-22 15:39:59 +05:30
Afshan
02d495f1fb fix: added query for fetching salary component 2021-01-22 15:39:59 +05:30
prssanna
2aa1efb70e fix: broken image style 2021-01-22 15:31:38 +05:30
Rucha Mahabal
6058ea88e8
fix: SLA not applied automatically when priority is missing (#24447) 2021-01-22 13:35:08 +05:30
Marica
5631d014a7
Merge branch 'develop' into item-wise-purchase-registry-item-name-error 2021-01-22 12:35:35 +05:30
Deepesh Garg
0d26d24164
Merge pull request #24414 from Alchez/dev-irs-1099-year
fix: use supplied year for IRS 1099 forms
2021-01-22 12:17:43 +05:30