Commit Graph

1838 Commits

Author SHA1 Message Date
marination
a5d8d32775 chore: Test and fixes
- Tests as per new design flow
- Fixed duplicate data bug in Warehouse Capacity Summary
- Set Amount currently on applying rule in client side
- Apply rules on server side before validate
2020-12-09 16:27:18 +05:30
Deepesh Garg
bc0a2859e4 fix: Rate for items with no batch 2020-12-09 12:40:09 +05:30
Mohammad Hasnain Mohsin Rajan
deaf2e80cb
fix: linting 2020-12-09 12:36:14 +05:30
Mohammad Hasnain
69514c4761 fix: scan barcode does not update barcode item field in sales order 2020-12-09 12:10:28 +05:30
Deepesh Garg
91e1136d2c feat: Batch wise item pricing 2020-12-08 22:53:03 +05:30
marination
0f3cfc502b feat: Trigger rule application from client side
- Table is reset and overwritten with applied rules on checkbox trigger
- Sider fixes
2020-12-08 19:44:29 +05:30
Rushabh Mehta
fec8dba16c fix(merge): merge develop 2020-12-08 16:23:09 +05:30
Marica
0b68243979
Merge branch 'develop' into putaway 2020-12-08 11:44:00 +05:30
marination
fac4035f23 feat: Apply Putaway Rules within transaction itself
- Added checkbox 'Apply Putaway Rule' in PR and SE
- Added link to rule in child tables
- Rule is applied on Save
- Validation for over receipt
- Apply Rule on Stock Entry as well for Material Transfer and Receipt
2020-12-07 21:35:49 +05:30
rohitwaghchaure
0a672b69e6
Merge pull request #22859 from marination/pr-dn-return
feat: Return tracking in PR/DN
2020-12-06 22:43:34 +05:30
Marica
afc517b8bf
Merge branch 'develop' into link-to-mr 2020-12-04 16:30:40 +05:30
Deepesh Garg
7b2d518059 fix: Dimension filters in accounting reports 2020-12-04 11:28:26 +05:30
Deepesh Garg
12b45b3f2a Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters 2020-12-02 12:46:23 +05:30
Leela vadlamudi
a3845a95ed
feat: Introducing telephony module (#24032) 2020-12-01 13:04:53 +05:30
Marica
307bd01504
Merge branch 'develop' into pr-dn-return 2020-11-25 17:24:03 +05:30
Mohammad Hasnain Mohsin Rajan
90e33e53fd
refactor: Format translation strings (#24004)
* fix: translation strings

* fix: linting
2020-11-25 15:37:54 +05:30
Mohammad Hasnain Mohsin Rajan
e15b6a91de
Filters for tax templates (#23998)
* feat: add company filter to tax templates

* fix: remove filer from PO because it is from tran

* fix: linting

* fix: solve translation string issues

* fix: remove doctype name
2020-11-25 15:36:41 +05:30
Deepesh Garg
1a4390de44 Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters 2020-11-25 14:51:11 +05:30
Deepesh Garg
6b9dda5f3e fix: Move filter setup to doctype controllers 2020-11-25 14:49:10 +05:30
Marica
df17b4ff83
Merge branch 'develop' into pr-dn-return 2020-11-25 10:43:55 +05:30
Raffael Meyer
fbcc3c1b70
fix: Translatable strings (#23783)
* fix: start_pattern

* fix: translatable strings

* fix: add missing semicolon (task)

* fix: add missing semicolon (setup_wizard)

* fix: text should start on the same line

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>

* fix: move out HTML element as variable

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>

* fix: pull out message, translate "Undo".

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>

* fix: typo

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>

* fix: text should start on the same line

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>

* Revert "fix: start_pattern"

This reverts commit decc62e2ab75f45db1df022fe13780c2d0d2560d.

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-11-25 09:11:51 +05:30
Saqib Ansari
7f1d7894c2 fix: cannot find erpnext.payments 2020-11-24 16:08:38 +05:30
Saqib Ansari
c1afc95e3c chore: remove unused code 2020-11-23 18:40:06 +05:30
Marica
9b897c4073
Merge branch 'develop' into pr-dn-return 2020-11-19 12:21:38 +05:30
Rushabh Mehta
542bc01718 fix(minor): update routes 2020-11-18 15:00:34 +05:30
Deepesh Garg
9e9ea96582 fix: linting 2020-11-16 12:03:47 +05:30
Deepesh Garg
f916bc048f fix: Remove cost center query from doctypes 2020-11-15 22:44:39 +05:30
Deepesh Garg
6e5748e2a3 fix: dimension filter query 2020-11-15 22:43:48 +05:30
Deepesh Garg
96e874bfda fix: dimension filter query 2020-11-15 22:43:01 +05:30
Shivam Mishra
bed717b442 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-11-12 11:32:59 +05:30
Jannat Patel
a9e02bba77
Merge branch 'develop' into purchase-taxes-and-charges-account-name-issue 2020-11-11 16:46:01 +05:30
pateljannat
7e4d115e36 fix: sider issues fixed 2020-11-11 09:52:27 +05:30
pateljannat
b648b9cf93 fix: code review changes 2020-11-10 18:50:02 +05:30
UrvashiKishnani
bc64f5dfbb
fix: spelling error in filter label (#23867) 2020-11-09 20:14:06 +05:30
Suraj Shetty
e3fe8ff195
Merge branch 'develop' into purchase-taxes-and-charges-account-name-issue 2020-11-09 19:16:23 +05:30
Marica
d845e8a53a
Merge branch 'develop' into pr-dn-return 2020-11-06 12:25:11 +05:30
Marica
c070f2ed57
Merge branch 'develop' into dialog-cleanup 2020-11-05 18:37:56 +05:30
pateljannat
5b02d32826 fix: trailling spaces removed 2020-11-05 18:04:14 +05:30
Saqib
bc919e2e7d
fix: cannot expand row in update items dialog (#23839) 2020-11-05 17:38:35 +05:30
pateljannat
403822afb3 fix: correcting description field in taxes and charges for accounts that have account number + account name 2020-11-05 16:24:33 +05:30
marination
28dd90f3dc Merge branch 'develop' of https://github.com/frappe/erpnext into pr-dn-return 2020-11-02 15:16:31 +05:30
marination
d6596a169c fix: Billing % Logic and Map Pending Qty only in PR and DN
- Billing % should consider unreturned amount as total
- While mapping to return doc, map unreturned amount
- Added field Received Qty in Stock UOM, to tally against Returned Qty in PR
- PR billing percentage updation custom function
- In patch set received qty in stock uom first, then update returned qty and billing
2020-11-02 15:07:48 +05:30
Marica
e0ec58d8fa
Merge branch 'develop' into link-to-mr 2020-11-01 23:48:58 +05:30
marination
e14fdf4a3c chore: RFQ cleanup and Title case for 'Get Items From'
- Cleanup up RFQ Get Items From Dialogs
- Title cased 'Get items from' to 'Get Items From'
2020-10-30 17:06:00 +05:30
Marica
8f6bd851d3
chore: Show Toast alert feedback on Scanning Barcode (#23760) 2020-10-29 18:55:52 +05:30
Saqib
7d9dd3c628
fix: item wise tax calculation (#23744) 2020-10-28 17:07:10 +05:30
Marica
16a1f7e7e3
Merge branch 'develop' into link-to-mr 2020-10-27 11:49:35 +05:30
Saqib
60212ff9b9
fix: multiple pos issues (#23347)
* fix: point of sale search

* fix: pos fetches expired serial nos

* fix: pos doesn't refresh on route change

* fix: opening balances not set in opening entry

* fix: remove debug statement

* fix: invalid query if no serial no is reserved by pos invoice

* chore: make new order btn primary

* chore: filter warehouse by company

* chore: add shortcuts for new order and email

* fix: cannot fetch serial no if no batch control

* chore: add shortcuts for menu items

* feat: standard keyboard shortcuts for pos page

* feat: display only items that are in stock

* fix: empty point of sale page if opening entry dialog is closed

* feat: conversion factor in pos item details

* fix: show all invalid mode of payments

* chore: show all items if allow negative stock is checked

* fix: -ve amount set when changing mode of payment

* fix: pos closing validations

* fix: test

* fix: non expired serial no fetching query

* fix: cannot dismiss pos opening creation dialog

* fix: transalation strings

* fix: msgprint to throw

* chore: use as_list in frappe.throw

* chore: clean up pos invoice.js & .py

* fix: codacy

* fix: transalation syntax

* fix: codacy

* fix: set_missing_values called twice from pos page

* fix: mode selector with double spaces

* fix: do not allow tables in pos additional fields

* fix: pos is not defined

* feat: set mode of payments for returns

* fix: remove naming series from pos profile

* fix: error message

* fix: minor bugs

* chore: re-arrange pos closing entry detail fields

* fix: sider & frappe linter

* fix: more translation strings

* fix: travis

* fix: more translation strings

* fix: sider

* fix: travis

* fix: unexpected end of string

* fix: travis

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-10-26 11:17:04 +05:30
Nabin Hait
db474aea95
Merge branch 'develop' into link-to-mr 2020-10-22 21:45:07 +05:30
Shivam Mishra
9d468a8daf Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-10-21 11:38:31 +05:30
Marica
ca5ad076d5
Merge branch 'develop' into link-to-mr 2020-10-16 16:49:38 +05:30
marination
359778e235 chore: Code cleanup, reduce redundancy 2020-10-16 16:47:23 +05:30
Abhishek Balam
349fcfd6a5 fix: set default filters on unchecking box, code cleanup 2020-10-15 12:21:43 +05:30
Abhishek Balam
89419c9a30 fix: move get_shipping_address() from frappe to erpnext and fix references 2020-10-14 20:09:05 +05:30
Abhishek Balam
38b26c8f3e fix: added semicolons 2020-10-14 18:24:51 +05:30
Abhishek Balam
346ca568b7 fix: set company link in address when is_your_company_address is set 2020-10-14 18:11:04 +05:30
Deepesh Garg
71a58a8fd0
Merge pull request #23605 from marination/item-link-formatter
fix: Item Link Formatter Behaviour
2020-10-13 21:26:00 +05:30
Deepesh Garg
06268e5f57
Merge pull request #23623 from kennethsequeira/italy-fy
fix: Fiscal Year and Tax Rates for Italy
2020-10-13 20:29:51 +05:30
Shivam Mishra
55f52e8135 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-10-13 20:09:22 +05:30
Kenneth Sequeira
56d305b966 fix: update italy fiscal year 2020-10-13 00:07:52 +05:30
marination
824f48fd23 fix: Item Link Formatter Behaviour 2020-10-12 20:08:03 +05:30
Saqib
56fea7d243
fix: update items after submission ignores precision (#23491)
* fix: update items after submission ignores precision

* chore: add test
2020-10-09 21:19:25 +05:30
Faris Ansari
db8764a520
Merge pull request #23201 from alyf-de/website_theme_scss
fix: style for website theme
2020-09-30 18:26:58 +05:30
Marica
818522bd45
Merge branch 'develop' into dialog-filters 2020-09-28 21:18:23 +05:30
madar2020
ce39323a0a
feat: Allow rich text edit for questions (#23402)
* rich text

* Update question.json

As to make sense for rich text

* Update quiz_question.json

* Update question.json

* Update quiz_question.json

* Update macros.html

fix: cards in second row of homepage section overlapps the row before.

* Revert "Update macros.html"

This reverts commit b649b507e5d546b5b4a78fbf68053493a71c7af2.

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-09-28 17:36:25 +05:30
Raffael Meyer
21266fe4a4
Merge branch 'develop' into website_theme_scss 2020-09-28 10:15:55 +02:00
Shivam Mishra
9a4d603403 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-09-25 11:44:37 +05:30
marination
be4dbad823 style: (minor) Reduce loc 2020-09-24 16:43:25 +05:30
marination
a119688e32 fix: (RFQ/SQ) Link to Material Requests in Tools section 2020-09-24 15:57:43 +05:30
marination
4f395cce54 chore: Add Filter Group to dialogs 2020-09-24 12:43:41 +05:30
marination
8370d9b997 fix: Check Company in Payment Entry before selecting values 2020-09-24 11:51:03 +05:30
Raffael Meyer
8b78bf19bd
Merge branch 'develop' into website_theme_scss 2020-09-23 11:38:59 +02:00
Saurabh
30dbfc31e2
Merge pull request #23369 from abhishekbalam/breadcrumbs_for_maintenance
Fix(Maintenance): Breadcrumbs for Maintenance Visit and Schedule
2020-09-21 17:03:46 +05:30
Abhishek Balam
97f61d233e fix: breadcrumbs for maintenance visit and schedule under support 2020-09-21 13:00:43 +05:30
Deepesh Garg
095161ff60
Merge pull request #23328 from rohitwaghchaure/fixed-set-taxes-missing-error
fix: set_taxes() missing 1 required positional argument: 'company'
2020-09-19 18:07:08 +05:30
Deepesh Garg
0aff6d83af
Update erpnext/public/js/utils/party.js
Co-authored-by: Sagar Vora <sagar@resilient.tech>
2020-09-19 18:05:58 +05:30
SDLyu
68672af8ab
Fix missing tax autoload when frm.doc.taxes is [] 2020-09-18 13:58:23 +08:00
Rohit Waghchaure
4f3b7da9ba fix: set_taxes() missing 1 required positional argument: 'company' 2020-09-15 14:47:36 +05:30
Marica
baedc627ee
Merge branch 'develop' into item-tax-update-items 2020-09-15 11:30:22 +05:30
Saqib
61314248bb
feat: uom in update items for SO & PO (#22869)
* feat: uom in update items for SO & PO

* fix: supplied items doesn't updates on uom change

* chore: add uom and conv factor change test

* fix: test

* fix: purchase order updates are not tracked

* fix: fetch conversion factor on uom change

* fix: codacy

Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-09-15 11:14:31 +05:30
Marica
65c2c4f85f
Merge branch 'develop' into item-tax-update-items 2020-09-15 09:49:06 +05:30
marination
b7cd84196d fix: Revert tax calculation changes 2020-09-15 09:42:51 +05:30
barredterra
8e41fdfee4 Merge branch 'develop' into website_theme_scss 2020-09-11 16:05:49 +02:00
Saqib
cd89994b33
fix: multiple pos issues (#23297)
* fix: returns can be made against unconsolidated invoices

* fix: indentation

* fix: mode of payment not fetching for pos returns

* patch: default pos profile print format

* fix: tests

* chore: clean up retail desk page
2020-09-10 19:28:46 +05:30
Afshan
eb4b2aa142
fix: get_items from product bundle for purchase order (#22821)
* fix: get_items from product bundle for purchase order

* fix: Don't overwrite  doctype while setting attributes in child row

Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-09-01 15:01:32 +05:30
Deepesh Garg
d79b511e3f
Merge pull request #22950 from deepeshgarg007/billing_address_fetch
fix: Add default billing address for purchase documents
2020-08-31 17:16:31 +05:30
barredterra
a162248f32 fix: use hook for website theme scss 2020-08-28 15:16:39 +02:00
Suraj Shetty
6f9f40992c Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-08-23 16:33:50 +05:30
Deepesh Garg
1b760cb278 Merge branch 'develop' of https://github.com/frappe/erpnext into navbar_links 2020-08-21 12:36:21 +05:30
Marica
c23797e350
fix: Create Opportunity without Default Company from Email (#23097)
* fix: Create Opoortunity without Default Company from Email

* fix: Add Prompt to Select Company

* Update communication.js

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-08-20 19:12:12 +05:30
marination
22d3729427 fix: Codacy 2020-08-19 15:42:40 +05:30
marination
698d983eef fix: Item Tax Updation via Update Items in SO/PO 2020-08-19 14:59:46 +05:30
Deepesh Garg
617027c6ca Merge branch 'develop' of https://github.com/frappe/erpnext into navbar_links 2020-08-12 18:39:20 +05:30
Deepesh Garg
7d0a625b9c
git commit -m "fix: Add missing semicolon" 2020-08-11 22:02:12 +05:30
Nabin Hait
19ea7218d9 fix: Calculate taxes if tax is based on item quantity and inclusive on item price 2020-08-11 20:34:57 +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
marination
a07973cfa5 fix: Creating opportunity from email 2020-08-10 12:39:42 +05:30
Deepesh Garg
af1f46f2d9 fix: Add default billing address for purchase documents 2020-08-07 19:44:20 +05:30
Deepesh Garg
a306af8c08 fix: Add help link in navbar settings 2020-08-06 20:52:02 +05:30
Shivam Mishra
11111cd9a9 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-07-30 21:29:02 +05:30