Commit Graph

2365 Commits

Author SHA1 Message Date
Ankush Menat
f4c213379e fix: set current qty as default qty for stock entry 2022-03-19 20:55:27 +05:30
Deepesh Garg
d596e0e4df fix: Shipping rule application fixes 2022-03-10 20:56:36 +05:30
Subin Tom
1ab5b7a811 fix: linter, sider fixes 2022-02-28 12:47:05 +05:30
Rushabh Mehta
1e7df5d0c2 fix(minor): student attendance tool query fix 2022-02-26 11:07:44 +05:30
Rucha Mahabal
71d33081aa
fix: org chart connectors not rendered when Employee Naming is set to Full Name (#29997) 2022-02-25 23:01:32 +05:30
Subin Tom
f1f3e035a6 Merge branch 'exotel-fixes' of https://github.com/nemesis189/erpnext into exotel-fixes 2022-02-25 16:59:35 +05:30
Subin Tom
5b79496f05 fix: call type doctype, fixes 2022-02-25 16:52:25 +05:30
Deepesh Garg
25edc700bd
Merge pull request #29974 from deepeshgarg007/abbr_check
fix: Make abbreviation limit to 10
2022-02-25 15:52:51 +05:30
Saqib Ansari
81514516f3 fix(pos): coupon code is applied even if ignore pricing rule is check 2022-02-25 15:18:06 +05:30
Subin Tom
a91fb88929
fix: sider fixes 2022-02-25 13:45:26 +05:30
Subin Tom
00b0f10100 fix: added type of call select field, additional status for agent rejecting call 2022-02-25 13:38:57 +05:30
Deepesh Garg
239733acd1 fix: Make abbreviation limit to 10 2022-02-23 20:41:49 +05:30
Deepesh Garg
bd80e04aa7
Merge pull request #29865 from deepeshgarg007/loan_bank_reco
feat: Bank Reconciliation for loan documents
2022-02-22 20:43:00 +05:30
Marica
235fc127b3
fix: Fetch conversion factor even if it already existed in row, on item change (#29917)
* fix: Fetch conversion factor even if it already existed in row, on item change

* fix: Retain manually changed conversion factor

- If item code changes, reset conversion factor on client side
- Keep API behavious consistent, if conversion factor is sent, same must come back
- API should not ideally reset values in most cases
2022-02-22 12:53:46 +05:30
Deepesh Garg
0d8c24f488 Merge branch 'develop' of https://github.com/frappe/erpnext into loan_bank_reco 2022-02-21 22:22:02 +05:30
Ankush Menat
342d09a671 feat: get_valuation_rate batch wise
This function is used to show valuation rate on frontend and also as
fallback in case values aren't available. Add "batch_no" param to get
batch specific valuation rates.

Co-Authored-By: Alan Tom <2.alan.tom@gmail.com>
2022-02-21 18:02:40 +05:30
Deepesh Garg
b7c388976d Merge branch 'develop' of https://github.com/frappe/erpnext into loan_bank_reco 2022-02-21 16:58:52 +05:30
Deepesh Garg
555b1335f6 feat: Bank Reconciliation for loan documents 2022-02-17 19:15:30 +05:30
Saqib Ansari
2743999785 fix: coupon code is applied even if ignore_pricing_rule is enabled 2022-02-17 16:03:43 +05:30
Saqib Ansari
4f4395545e
Merge branch 'develop' into fix-ignore-pricing-rule 2022-02-08 15:29:28 +05:30
Saqib Ansari
5e32b809cb
Merge pull request #29599 from nemesis189/coupon-code-issue-pos
fix: Coupon code item pricing dynamic updation issue in pos screen
2022-02-08 11:50:19 +05:30
Saqib Ansari
4c3d751421
Merge branch 'develop' into fix-ignore-pricing-rule 2022-02-08 11:42:33 +05:30
Mohammed Yusuf Shaikh
a3e69cf75d
feat: Bulk Transaction Processing (#28580)
* feat: Bulk Transaction Processing

* fix: add flags to ignore validations and exception handling correction

* fix: remove duplicate code, added logger functionality and improved notifications

* fix: linting and sider issues

* test: added tests

* fix: linter issues

* fix: failing test case

* fix: sider issues and test cases

* refactor: mapping function calls to create order/invoice

* fix: added more test cases to increase coverage

* fix: test cases

* fix: sider issue

* fix: rename doctype, improve formatting and minor refactor

* fix: update doctype name in hooks and sider issues

* fix: entry log test case

* fix: typos, translations and company name in tests

* fix: linter issues and translations

* fix: linter issue

* fix: split into separate function for marking failed transaction

* fix: typos, retry failed transaction logic and make log read only

* fix: hide retry button when no failed transactions and remove test cases not rrelevant

* fix: sider issues and indentation to tabs

Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-02-08 01:00:37 +05:30
Marica
79ab8e6459
Merge pull request #29456 from marination/product-bundle-packing-list-logic
fix: Incorrect packing list for recurring items & code cleanup
2022-02-03 22:09:52 +05:30
marination
017a882f90 fix: Remove cart.js from erpnext-web bundle
- Due to it being in the bundle, controls bundle was required for Dialogs used in cart
- But this is exclusively used in `cart.html`
- It has no reason to load and break the login page
- Moved it back to where the html is, it is now back to being tightly coupled with its html
2022-02-03 21:34:48 +05:30
Suraj Shetty
e652ab5f05 fix: Load control & dialog assets with cart.js
Previously, control & dialog assets were getting loaded only on visiting "/cart", but since cart.js sets up various events on homepage, dialog related assets are required up-front.
2022-02-03 20:06:24 +05:30
Marica
e9fc6c3249
Merge branch 'develop' into product-bundle-packing-list-logic 2022-02-03 17:02:57 +05:30
marination
f47db26fa6 fix: Cart buttons not working
- Add cart.js to web bundle
- Hide icon conditionally since now this file loads on every single page
2022-02-03 12:54:59 +05:30
Saqib Ansari
5a7236efcd
Merge branch 'develop' into fix-ignore-pricing-rule 2022-02-02 21:47:51 +05:30
Subin Tom
ccf63124d6 fix: Coupon code item pricing dynamic updation issue 2022-02-02 20:13:33 +05:30
marination
8c90c505c0 fix: (minor) build issues on cart and item page
- Move `cart.js` to public/js directory
- Reorder import sequence in erpnext web bundle
- Removed unused script block
2022-02-02 10:40:45 +05:30
marination
7bc087ed44 fix: Merge conflicts, Linter and Server Test
- Resolve inconsistency due to conflict with https://github.com/frappe/erpnext/pull/27050
- Resolve Linter issues (imports and spaces)
- Include customer_reviews.js in bundle, move it to /public/js
2022-02-01 10:51:50 +05:30
marination
b2b827f50f chore: Adjust to ESbuild and missing imports
- update erpnext web bundle and tweak to fit new build system
- change page id in scss due to change in v14 router
- add missing imports
2022-02-01 00:03:08 +05:30
Ankush Menat
6cd7c47409 Merge branch 'develop' into e-commerce-refactor-develop 2022-01-31 17:14:36 +05:30
Ankush Menat
14e3e163ae fix: ignore alternate item while checking pending qty 2022-01-29 13:59:25 +05:30
marination
4c677eafe9 fix: Linter and minor code refactor
- Create an indexed map of stale packed items table to avoid loops to check if packed item row exists
- Reset packed items if row deletion takes place
- Renamed functions to self-explain them
- Split long function
- Reduce function calls inside function (makes it harder to follow through)
2022-01-26 01:10:24 +05:30
Saqib Ansari
f6dda738dc fix: ignore pricing rule in all transactions 2022-01-20 12:22:56 +05:30
Marica
b5abf68b0d
Merge branch 'develop' into e-commerce-refactor-develop 2022-01-12 02:52:03 +05:30
Deepesh Garg
b83608b029
Merge pull request #28994 from nextchamp-saqib/zero-qty-debit-note
fix: cannot create debit note with zero qty
2022-01-07 18:35:24 +05:30
Deepesh Garg
f6f449ed18
Merge pull request #29176 from deepeshgarg007/outstanding_amount_anomaly
fix: Inconsistency in calculating outstanding amount
2022-01-07 13:28:52 +05:30
Deepesh Garg
9d3a5c3184 fix: Inconsistency in calculating outstanding amount 2022-01-06 18:58:49 +05:30
Chillar Anand
0900c3d655
refactor: Removed agriculture module from ERPNext (#29022) 2022-01-04 17:26:11 +05:30
Saqib Ansari
79ccf80faf
Merge branch 'develop' into zero-qty-debit-note 2021-12-29 17:32:16 +05:30
Deepesh Garg
6eb3d6a814
fix: Conflicts 2021-12-25 09:04:34 +05:30
Deepesh Garg
2d0208ba1f fix: Add round floats for price list rate
(cherry picked from commit b60fbf5ba95350e79463f922b0e8dce518780383)
2021-12-24 14:03:48 +00:00
Deepesh Garg
d19369b198 fix: Recalculate taxes irrespective of price list rate changed or not
(cherry picked from commit 233f79bf960381b1c2bd753d783afd3020b377e0)

# Conflicts:
#	erpnext/public/js/controllers/transaction.js
2021-12-24 14:03:48 +00:00
Deepesh Garg
4756fbc253 fix: Linting issues
(cherry picked from commit 0980c2f9816b3e4a11b5410b5997a72b1cad28fd)
2021-12-24 14:03:47 +00:00
Deepesh Garg
ab09dc545e fix(UX): Optimize rate updation of changing price list
(cherry picked from commit 6087d5a6038d6e636ce1ba006ebd59e820b3cd8e)
2021-12-24 14:03:47 +00:00
Saqib Ansari
04ea42ce52 fix(sales-invoice): cannot create debit note with zero qty 2021-12-22 13:23:42 +05:30
Subin Tom
98d417602f
fix: Added filter for dispatch address (#28937) 2021-12-21 12:35:44 +05:30
mergify[bot]
c1a0f649cb
fix: convert asynchronous field update to synchronous (#28930)
(cherry picked from commit 5adf85f5b7ba94591381b03709b1fee6aa9331a5)

Co-authored-by: Dan Navarro on Ubuntu Work <danjeremynavarro@gmail.com>
2021-12-17 19:06:19 +05:30
Saqib
2411477e6d
fix: time to response shows failed (#28895) 2021-12-15 11:45:34 +05:30
Saqib
7d0a3e4e8b
Merge pull request #28550 from nextchamp-saqib/fix-sla
refactor(SLA): Application of SLA and its fields
2021-12-13 10:29:56 +05:30
Ankush Menat
d37541d3fb fix: ensure that reposting is finished before freezing stock/account 2021-12-10 12:31:49 +05:30
Saqib Ansari
476e81a631 fix: time to respond & resolve indicators 2021-12-06 18:55:30 +05:30
Saqib
4889661e5c
fix: actual tax conversion in case of multicurrency invoices (#28539) 2021-12-02 11:37:08 +05:30
Rucha Mahabal
5ba1bc1572
fix: Employee link formatter showing incorrect value for Employee Name (#28504) 2021-11-23 09:30:30 +05:30
Deepesh Garg
a57d39909e
Merge pull request #28302 from nemesis189/shipping-rule-updation-error
fix: Shipping Rule picking up old net_rate
2021-11-19 08:21:53 +05:30
Subin Tom
e7b4204c35 fix: sider issues 2021-11-16 20:39:58 +05:30
Subin Tom
a8e2c02e14 fix: fixed tests, separated a method for shipping charges 2021-11-16 19:06:49 +05:30
Marica
4096b1471f fix: Shopping Cart and Variant Selection (Hotfix PR #27508) 2021-11-16 17:46:57 +05:30
marination
45f64bd930 Chore: Miscellaneous UI review changes
- Added bg (variable) to pages, card space separation visible
- Removed `show brand line` in settings, shown by default
- Re-arranged settings by importance
- View toggling primary colour is grey
- Only populate recent searches on successful search
- Hit only one server side api, once while searching
- List view primary button float right
- Discounts takes upper limit eg. 10% and below
- Navbar icons only wiggle on qty increase in cart/wishlist
- Pay button in SO portal
- Remove bottom white space below item full page image, min-height fits to content
- List view vertical space between heading and item code
- Empty offer subtitle handled
2021-11-16 17:37:08 +05:30
marination
1bb135b2d3 fix: Sider and CI
- Incorrect path and Settings in price_list.py import due to merge
- Extra space removed in website_item.py
- Changed client side namespace to `erpnext.e_commerce.*`
2021-11-16 17:23:39 +05:30
marination
b4529b8511 test: Recommendations, Reviews and Wishlist
- Tests for verified and unverified item reviewers
- Test for recommended items and their prices
- Test for adding removing items from Wishlist
- Bug: Wishlist deletes all entries of an item code irrespective of user
- Get Item reviews only if enabled
- Removed price fields from Wishlist Item and made fields read only
- Removed unused price stored as data on Wishlist buttons
- Customer Reviews page checks if reviews are enabled else shows No Reviews
- Moved price stock fetching in Wishlist in separate function
- Made fields read only in Item Review
2021-11-16 17:10:23 +05:30
marination
929a24ea5c feat: Cart minor UI/UX Refresh
- Added Setting to show or hide price if checkout is disabled
- Show Web Item name in cart instead of Desk Item name
- Cart minor UI Refresh: added images in cart
- Cart minor UI Refresh: repositioned remove button and redesigned
- Cart minor UI Refresh: Payment Summary section
- Cart minor UI Refresh: Disable input on free item
- Cart minor UI Refresh: Add address button in cards
- New file for cart payment summary UI with coupon code (old)
2021-11-16 17:03:17 +05:30
marination
2fec068aff feat: Recommended Items and Item full page refresh
- Added Optional Recommended Items
- Item Full Page minor UI Refresh
- Floating wishlist button in item full page
- Reviews section UI Refresh
2021-11-16 17:02:43 +05:30
marination
b5e7f04b33 chore: UI refresh for grid/list view and search
- enhanced UI for grid/list view, actions visible on hover only
- enhanced search UI
- Added indicator to show if item is in cart
- Moved search with view togglers
2021-11-16 17:01:06 +05:30
marination
82f8f3caf2 feat: Guest Display Settings
- Re-arranged Settings checkboxes
- Deleted `show_availability_status` from E Commerce Settings
- Added `Hide Price for Guest` functionality
- Added Custom Redirection for Guest Actions in  E Commerce Settings
- Minor cleanups
2021-11-16 16:54:21 +05:30
marination
b0d7e32018 feat: Search UI
- Search UI with dropdown results
- Client class to handle Product Search actions and results
- Integrated Search bar into all-products and item group pages
- Run db search without redisearch
- Cleanup: [Search] change decorator names and variables
- Sider fixes
2021-11-16 16:45:48 +05:30
marination
53bb7a9cd1 chore: Shopping Cart styles and cleanup shallow
- Added remove button to cart item rows
- Freeze on change in Shopping Cart (UX)
- Fixed cart items and taxes/totals alignment issues
- Made Cart responsive
- Added free item indicator
- Fixed item group nested routing issue
- Sales Order is populated with right source warehouse
2021-11-16 16:39:58 +05:30
marination
b29c5d6e84 fix: Discount Filters and Web templates
- Fixed discount filters (didn’t work after js render change)
- Fix Item Card Group template height and style
- Add placeholder to missing images in Product Category Cards template
- Code cleanup
2021-11-16 16:37:08 +05:30
marination
423d7516b4 fix: Empty states and miscellanous fixes
- Added Wishlist and Product Listing empty states
- Hide ‘Write Review’ button f user is not Customer
- Fixed grid view title (missing arg)
- Render empty state if no items form server side
- Removed unused function
- Guest user redirected to login on clicking Wishlist button
- Fixed ‘Notes’ field clearing issue
2021-11-16 16:35:43 +05:30
marination
48b3ce82b9 feat: (wip) Toggle Views
- Auto Height on Cards
- Title with ellipses on length exceed
- Changed namepaces
- Moved product card rendering to JS
- Added Image and List View Toggling buttons
- Kept basic filters rendering just as before
2021-11-16 16:11:09 +05:30
marination
f9929ed8a6 Merge branch 'develop' of https://github.com/frappe/erpnext into e-commerce-refactor-develop 2021-11-16 16:06:07 +05:30
Deepesh Garg
74ccaeb07d
Merge branch 'develop' into shipping-rule-updation-error 2021-11-15 20:34:05 +05:30
Subin Tom
c78b8b7897 fix: Shipping Rule picking up old net_rate 2021-11-09 14:46:45 +05:30
marination
5fb5a757cf refactor: (ux) Accepted/Rejected/Received Qty UX 2021-11-08 13:23:42 +05:30
Ankush Menat
b01635e1da
refactor!: remove hub #28117
refactor!: remove hub
2021-10-28 14:07:15 +05:30
Deepesh Garg
3a6894fb9c fix: Autoemail report not showing dynamic report filters 2021-10-27 19:39:18 +05:30
Deepesh Garg
ddacff38ba
Merge pull request #28002 from ankush/dont_recompute_item_tax
fix: dont recompute item wise taxes from front end
2021-10-20 19:19:44 +05:30
Ankush Menat
393749a611
fix: dont recompute item wise taxes from front end 2021-10-19 14:13:34 +05:30
Rucha Mahabal
8eacaddde7
fix: flaky Org Chart Test (#27971) 2021-10-18 11:06:16 +05:30
marination
1d94914102 feat: Discount Filters
- Discount filters in filters section
- Code cleanup
2021-10-12 17:46:03 +05:30
marination
cd117149e1 fix: Sider 2021-10-12 17:24:15 +05:30
marination
59514408b9 feat: Wishlist Page
- Navbar icon with badge count for wishlist
- Wishlist page with cards
- Cards can be moved to cart or removed in a click
- Separated all wishlist related methods into wishlist.js
- Made a common js method(util) to add/remove wishlist items
- Bug fix: Make sure items are removed from session user's wishlist
2021-10-12 17:23:55 +05:30
marination
96cc5068b2 feat: Wishlist from card actions
- Add remove items from wishlist
- Wishlist icon at nav bar
- Animate wishlist icon in card and navbar
- Remember wished state after refresh as well
2021-10-12 17:23:12 +05:30
marination
4f64d1c7f2 feat: Animate Add to Cart List interactions (UX)
- Increased qty in cart on clicking add to cart for existing item
- Simplified macro arguments
- Navbar cart icon animation
- Explore button for template item in card
- Add to cart button animation
2021-10-12 17:18:51 +05:30
marination
22f41a17b7 chore: Removed Shopping Cart Module
- Moved all files and web templates from Shopping Cart to E-commerce module
- Made Shopping Cart module obsolete
- Moved select E-commerce related files from Portal to E-commerce module
- Minor cleanups
- Fixed Shopping Cart and Product Configurator tests
2021-10-12 16:54:11 +05:30
marination
eef9cf152f chore: Drive E-commerce via Website Item
- Removed Shopping Cart Settings
- Portal fully driven via E Commerce Settings
- All Item listing querying will happen via ProductQuery engine only
- Product Listing via Website Items
- removed redundant code
- Moved all website logic from Item to Website Item
2021-10-12 15:48:06 +05:30
Kenneth Sequeira
90a249527d
fix: update dead links in help_links.js (#27860) 2021-10-08 13:27:16 +05:30
Kenneth Sequeira
07c680d7cc
fix: help links for purchase cycle and JV (#27856) 2021-10-07 20:27:10 +05:30
Kenneth Sequeira
646fd29f0e
fix: update help links for Sales Invoice page (#27853) 2021-10-07 18:38:37 +05:30
rohitwaghchaure
e740fec8d0
Merge pull request #27851 from rohitwaghchaure/option-to-set-size-for-multi-select-dialog
feat: option to set the width for the multi-select dialog box
2021-10-07 17:38:19 +05:30
Rohit Waghchaure
69ffddf747 feat: option to set the width for the multi-select dialog box 2021-10-07 17:33:58 +05:30
Rucha Mahabal
9e08229b7b
fix(Org Chart): use attribute selectors instead of ID selector for node IDs with special characters (#27717)
* fix(Org Chart): use attribute selectors instead of ID selector for node IDs with special chars

* fix: UI tests
2021-09-30 18:32:10 +05:30
Marica
c75c709114
Merge branch 'develop' into scan-batch 2021-09-30 14:07:54 +05:30
marination
abf450dc70 fix: Increment batch qty if pre-existing batch is scanned 2021-09-30 14:03:40 +05:30
Alan
72c081fd8f
fix: apply price list after batch or serial no insertion (#27566) 2021-09-28 12:56:26 +05:30
marination
596cf3951d fix: Batch scans get overwritten on the same row 2021-09-27 15:06:46 +05:30
Frappe PR Bot
4f7af79c31
fix: PO/PINV - Check if doctype has company_address field before setting the value (#27441) (#27576)
Co-authored-by: Vama Mehta <vama.mehta@inqubit.in>
(cherry picked from commit 666eaae6ce976c5d820b3b9f91d23a0ed28a263a)

Co-authored-by: vama <vamagithub@gmail.com>
2021-09-18 13:34:27 +05:30
Saqib
e03d9aa889
fix: unecessary keyword args were passed in mapper functions (#27563) 2021-09-17 13:03:27 +05:30
Saqib
7292f5476d
feat: (get_items_from) filter material request item in purchase order (#27449) 2021-09-13 12:13:43 +05:30
Sagar Vora
dae0a1c1d6
fix: Template Error due to use of single quote (#27433) 2021-09-11 17:54:21 +05:30
rohitwaghchaure
7b4a65484a
fix: manually added weight per unit reset to zero after save (#27330) 2021-09-03 22:00:14 +05:30
Rucha Mahabal
f828d853e3
fix: Org Chart fixes (#27290)
* fix(org chart): multiple root nodes not expanding on clicking Expand All

* fix: unstable filter inserts duplicate nodes
2021-09-01 23:07:26 +05:30
Ankush Menat
b147b85e6a
chore: whitespace / eof fixes 2021-09-01 16:57:21 +05:30
Deepesh Garg
fd467e6d32
fix: Correct company address not getting copied from Purchase Order to Invoice (#27217)
* fix: Correct company adderess not getting copied from Purchase Order to Invoice

* fix: Linting issues
2021-08-30 17:53:59 +05:30
marination
7b78473da3 fix: Indentation and removed f-strings
- Sider: fixed indentation in js
- Dont use f-strings in queries
2021-08-30 12:50:24 +05:30
marination
2a3ef03388 fix: Popup stale build and data consistency
- Include `supplier_quick_entry.js` in erpnext.bundle.js
- Create primary supplier address on update
- Set newly created address (quick entry)  in Supplier and Customer
- Clear address set in supplier and customer on delete (dependency)
2021-08-27 18:06:51 +05:30
marination
bf72ec0598 feat: (consistency) Add Primary Address and Contact section in Supplier
- The same is present in customer and is inconsistent with supplier
- Helps quickly create primary address and contact via quick entry
2021-08-27 15:51:31 +05:30
Frappe PR Bot
255b99ebdc
feat: Employee reminders (#25735) (#27115)
* feat: Add reminders section to HR Settings

* refactor: Extract generic function for getting Employees

* feat: Employee Work Anniversary Reminder

* feat: Daily Holiday Reminder

* fix: Unnecessary params and replace [] with .get()

* test: Daily Holiday Reminders

* test: is_holiday basic tests

* refactor: Move employee reminders code to separate module

* feat: Add advance reminder to HR settings

* feat: Advance Holiday Reminders

* refactor: get_holidays_for_employee

* feat: Email holiday reminders in advance + tests

* fix: Remove unused import

* refactor: HR Setting Reminder Section

* refactor: Remove Daily Holiday Reminders feat

* feat: Reminder miss warning

* fix: Failing test and function name change

* chore: Add patch for field rename

* chore: Rename frequency label

* fix: Failing patch test

* fix: sider and removed description of fields

* fix: email alignment

Co-authored-by: pateljannat <pateljannat2308@gmail.com>
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
(cherry picked from commit 24b2a315818d08ad4cb03347ccf5297df916a5ac)

Co-authored-by: Mohammad Hussain Nagaria <34810212+NagariaHussain@users.noreply.github.com>
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
2021-08-24 20:19:22 +05:30
Subin Tom
d4d5a4221a
feat: coupon code discount in pos invoice (#27004) 2021-08-24 16:22:46 +05:30
Ankush Menat
6de7b8ea93
fix: discard empty rows from update items (#27021) 2021-08-24 12:18:40 +05:30
Subin Tom
7d627df4db
fix: pos return payment mode issue (#26872) 2021-08-23 11:05:07 +05:30
Saqib
153fe1cdb4
refactor: scan barcode field scanning (#26990) 2021-08-20 11:09:51 +05:30
Ankush Menat
4551d7d602
chore: mass trailing whitespace and EOF fixes 2021-08-19 13:43:28 +05:30
Afshan
dc7280eef0
fix: filtering of items in Sales and Purchase Orders (#26936)
* fix: filtering of items in Sales and Purchase Orders

* fix: slider

* fix: slider
2021-08-18 17:44:40 +05:30
Rohit Waghchaure
eb1e3181a4 fix: conflicts while merging brnach version-13 to develop 2021-08-17 10:53:19 +05:30
Rucha Mahabal
67e3971c3b
fix: Org Chart fixes (#26952)
* fix: add z-index to filter to avoid svg wrapper overlapping

* fix: expand all nodes not working when there are only 2 levels

- added dom freeze while expanding all nodes and exporting
2021-08-16 10:38:39 +05:30
Rucha Mahabal
0b4959966c fix: expand all nodes not working when there are only 2 levels
- added dom freeze while expanding all nodes and exporting
2021-08-16 10:19:48 +05:30
Rucha Mahabal
4c612b7cb2 fix: add z-index to filter to avoid svg wrapper overlapping 2021-08-15 21:32:39 +05:30
Rucha Mahabal
4981746b9a
Merge branch 'develop' into org-chart-develop 2021-08-15 20:50:56 +05:30
Deepesh Garg
a7054560da
Merge branch 'develop' into po-payment-terms 2021-08-11 19:31:30 +05:30
Deepesh Garg
bff3b0962a fix: Override template only if setting is enabled 2021-08-10 23:58:27 +05:30
Frappe PR Bot
1167a9bf94
fix: unsetting of payment if no pos profile found (#26891)
* fix: unseting of payment if no pos profile found (#26884)

(cherry picked from commit b614834efe)

# Conflicts:
#	erpnext/public/js/controllers/taxes_and_totals.js

* fix: conflicts

* fix: conflicts

* fix: conflicts

* fix: conflicts

Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
Co-authored-by: Afshan <afshan13k@gmail.com>
2021-08-10 23:18:23 +05:30
Afshan
b614834efe
fix: unseting of payment if no pos profile found (#26884) 2021-08-10 21:33:58 +05:30
Rucha Mahabal
52cd007292 fix: make bundled assets for hierarchy chart 2021-08-10 20:13:28 +05:30
Frappe PR Bot
1a39d1a311
fix: cost center & account validation in Sales/Purchase Taxes and Charges (#26881) 2021-08-10 19:38:39 +05:30
Rucha Mahabal
f9afade7dc fix: test 2021-08-10 18:02:41 +05:30
Rucha Mahabal
78f50a9809 feat: Export chart option in desktop view 2021-08-10 18:02:05 +05:30
Rucha Mahabal
6f799d17ce feat: Expand All nodes option in Desktop view 2021-08-10 18:01:15 +05:30
Rucha Mahabal
a1d379d5d4 test: UI tests for org chart mobile
fix(mobile): detach node before emptying hierarchy

fix(mobile): sibling group not rendering for first level
2021-08-10 17:56:04 +05:30
Rucha Mahabal
3cc85e166f test: UI tests for org chart desktop 2021-08-10 17:55:53 +05:30
Rucha Mahabal
e1cf7712d9 fix: sider 2021-08-10 17:55:17 +05:30
Rucha Mahabal
9e7302a21e fix(mobile): collapsed nodes not expanding 2021-08-10 17:55:08 +05:30
Rucha Mahabal
9270de59f4 fix: sibling group expansion not working for root nodes 2021-08-10 17:51:37 +05:30
Rucha Mahabal
1a3c335feb feat: use icon for connections on mobile view 2021-08-10 17:50:13 +05:30
Rucha Mahabal
b6715189fb fix: do not sort by number of connections 2021-08-10 17:50:02 +05:30
Rucha Mahabal
a48b23e6a5 perf: Optimise Rendering
- optimise get_children function

- use promises instead of callbacks

- optimise selectors

- use const wherever possible

- use pure js instead of jquery for connectors for faster rendering
2021-08-10 17:49:53 +05:30
Rucha Mahabal
31a0f36ed9 feat: handle multiple root / orphan nodes 2021-08-10 17:49:44 +05:30
Rucha Mahabal
97d2bab434 fix: unnecessary variables 2021-08-10 17:49:36 +05:30
Rucha Mahabal
6a4cce2431 fix: removing orphaned connectors 2021-08-10 17:49:27 +05:30
Rucha Mahabal
781d1bf28d fix: sider 2021-08-10 17:49:12 +05:30
Rucha Mahabal
d363f9db3d fix: edit node button overflowing 2021-08-10 17:48:23 +05:30
Rucha Mahabal
6d06d8c207 feat: add arc to connectors in mobile view 2021-08-10 17:48:13 +05:30
Rucha Mahabal
4e7cda6e65 refactor: use arcs instead of bezier curves for cleaner connectors 2021-08-10 17:48:02 +05:30
Rucha Mahabal
aacb649050 feat: setup node edit action 2021-08-10 17:47:43 +05:30
Rucha Mahabal
249621af1b refactor: add options to chart
- method to return the node data

- wrapper for showing the hierarchy
2021-08-10 17:47:06 +05:30
Rucha Mahabal
281241dc24 chore: create separate files for Desktop and Mobile view and bundle assets 2021-08-10 17:46:51 +05:30
Anuja Pawar
0e337be065
fix: cost center & account validation in Sales/Purchase Taxes and Charges (#25929) 2021-08-10 17:26:35 +05:30
Nabin Hait
f8031d3d79
Merge pull request #26261 from ruchamahabal/org-chart
feat: Organizational Chart
2021-08-10 17:12:59 +05:30
Subin Tom
793063bf4e
fix: pos return payment mode issue (#26875) 2021-08-10 15:57:30 +05:30
marination
f22b858253 fix: Clean Serial No input on Server Side 2021-08-10 14:35:41 +05:30
Deepesh Garg
bcf56e64ba fix: Ignore default payment term templates when coping payment terms from orders 2021-08-09 18:53:14 +05:30
Deepesh Garg
a27ef14db6 fix: Override template only if setting is enabled 2021-08-07 00:12:57 +05:30
Deepesh Garg
0bba425fe3 fix: Ignore default payment term templates when coping payment terms from orders 2021-08-06 23:53:16 +05:30
Marica
7cbd755951
Merge branch 'develop' into serial-no-space 2021-07-30 14:09:19 +05:30
walstanb
655b5dc190 fix: date as reference_date from bank transactions 2021-07-28 14:30:11 +05:30
Deepesh Garg
8d52a22709
fix: Additional discount calculations in Invoices (#26553)
* fix: Additional discount calculations in Invoices

* revert: Client side handling for Dynamic GST Rates

* fix: Add update item tax template method back

* fix: Revert refresh field

* fix: add company change trigger
2021-07-26 19:00:57 +05:30
Frappe PR Bot
4209b3bda9
fix: included company in Link Document Type filters for contact (#26576) (#26634)
(cherry picked from commit cbddedab7b)

Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
2021-07-26 13:00:32 +05:30
Noah Jacob
cbddedab7b
fix: included company in Link Document Type filters for contact (#26576) 2021-07-26 12:54:35 +05:30
Rucha Mahabal
c676eaae57 fix: test 2021-07-25 23:11:18 +05:30
Rucha Mahabal
37198159aa feat: Export chart option in desktop view 2021-07-25 20:28:01 +05:30
Anurag0911
4128aa7628
fix: syntax error (#26610)
Removed "," at erpnext/public/js/controllers/taxes_and_totals.js:87
2021-07-23 16:52:42 +05:30
Nabin Hait
595c7a6e61 fix: merge conflict 2021-07-22 17:11:20 +05:30
marination
eecfc4c0ae fix: Clean Serial No input on Server Side 2021-07-22 13:23:54 +05:30
Nabin Hait
13466bba90
Merge pull request #26588 from deepeshgarg007/tax_flow_fix_pre_release
fix: Additional discount calculations in Invoices
2021-07-22 11:30:47 +05:30
Rucha Mahabal
1176761757 feat: Expand All nodes option in Desktop view 2021-07-21 23:19:47 +05:30
Deepesh Garg
9ab18b5341 fix: add company change trigger 2021-07-21 23:18:17 +05:30
Deepesh Garg
9fa92c912b fix: Revert refresh field 2021-07-21 23:18:17 +05:30
Deepesh Garg
72eb72f66f fix: Add update item tax template method back 2021-07-21 23:18:17 +05:30
Deepesh Garg
50b188214d revert: Client side handling for Dynamic GST Rates 2021-07-21 23:18:17 +05:30
Deepesh Garg
f9da88cb15 fix: Additional discount calculations in Invoices 2021-07-21 23:17:56 +05:30
Suraj Shetty
85c8daae9c fix: Pass doc and other parameters to properly prefill information - while creating customer from form dashboard 2021-07-20 10:24:14 +05:30
Suraj Shetty
c077314568 fix: Pass doc and other parameters to properly prefill information
- while creating customer from form dashboard
2021-07-20 09:57:18 +05:30
Rucha Mahabal
ee7eaf9c70 test: UI tests for org chart mobile
fix(mobile): detach node before emptying hierarchy

fix(mobile): sibling group not rendering for first level
2021-07-15 19:19:09 +05:30
Rucha Mahabal
f004b404d1 test: UI tests for org chart desktop 2021-07-14 23:50:54 +05:30
Deepesh Garg
13fffeb97b
Merge pull request #26473 from deepeshgarg007/bootstrapped_gst_setup_develop
feat(India): Bootstrapped GST Setup
2021-07-14 16:44:12 +05:30
Kenneth Sequeira
513375f264 fix: Nested/Multi-level BOM help link (#26409)
Updated the link for multi-level boms. Current link is broken.
2021-07-14 16:07:47 +05:30
Kenneth Sequeira
7a89033163 fix: update integration links in help.js (#26483) 2021-07-14 16:07:31 +05:30
Kenneth Sequeira
24e08301bc
fix: update integration links in help.js (#26483) 2021-07-14 16:02:49 +05:30
Deepesh Garg
2908f2ee20 fix: Revert Changes 2021-07-13 16:49:21 +05:30
Deepesh Garg
1001f29784 fix: Gracefully handle duplicate bank account name to make setup faster 2021-07-13 16:47:38 +05:30
Deepesh Garg
07d9f3f74b fix: Incorrect discount amount on amended document 2021-07-13 15:35:59 +05:30
Deepesh Garg
eef8e4a9d4
Merge pull request #26292 from deepeshgarg007/amended_doc_discount
fix: Incorrect discount amount on amended document
2021-07-13 15:34:24 +05:30
Rucha Mahabal
fc4079587b Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into org-chart 2021-07-13 12:38:37 +05:30
Deepesh Garg
4ff98cc171 fix: Incorrect discount amount on amended document 2021-07-12 11:27:28 +05:30
Kenneth Sequeira
862ce916ae
fix: Nested/Multi-level BOM help link (#26409)
Updated the link for multi-level boms. Current link is broken.
2021-07-09 21:52:50 +05:30
Rucha Mahabal
4582f28d0d fix: sider 2021-07-09 01:25:26 +05:30
Rucha Mahabal
24b31c0bf9 fix(mobile): collapsed nodes not expanding 2021-07-09 01:03:02 +05:30
Rucha Mahabal
06fc9e7847 fix: sibling group expansion not working for root nodes 2021-07-08 18:44:53 +05:30
Rucha Mahabal
05ffc0d3e0 feat: use icon for connections on mobile view 2021-07-08 16:55:42 +05:30
Rucha Mahabal
48018b8d8c fix: do not sort by number of connections 2021-07-08 11:23:50 +05:30
Rucha Mahabal
df3bb9ea8c perf: Optimise Rendering
- optimise get_children function

- use promises instead of callbacks

- optimise selectors

- use const wherever possible

- use pure js instead of jquery for connectors for faster rendering
2021-07-08 09:53:31 +05:30
Rucha Mahabal
6eec251273 feat: handle multiple root / orphan nodes 2021-07-07 12:05:50 +05:30
Rucha Mahabal
6d5ee25bba fix: unnecessary variables 2021-07-07 09:43:28 +05:30
Rucha Mahabal
ad06603392 fix: removing orphaned connectors 2021-07-06 18:16:49 +05:30
Deepesh Garg
63096014a7 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into bootstraped_gst_setup 2021-07-02 20:30:18 +05:30
Rucha Mahabal
2fcd05aa82 fix: sider 2021-07-02 18:15:18 +05:30
Deepesh Garg
991d3cdd76 fix: Incorrect discount amount on amended document 2021-07-01 21:17:17 +05:30
Rucha Mahabal
77b0b8a877 fix: edit node button overflowing 2021-06-30 02:29:16 +05:30
Rucha Mahabal
b8a18bfef1 feat: add arc to connectors in mobile view 2021-06-30 01:57:43 +05:30
Rucha Mahabal
a7507f7af6 refactor: use arcs instead of bezier curves for cleaner connectors 2021-06-30 01:46:10 +05:30
Rucha Mahabal
c40b9d276e feat: setup node edit action 2021-06-29 21:51:21 +05:30
Rucha Mahabal
f15e8b7f5a refactor: add options to chart
- method to return the node data

- wrapper for showing the hierarchy
2021-06-29 21:26:47 +05:30
Rucha Mahabal
bcc998e8c2 chore: create separate files for Desktop and Mobile view and bundle assets 2021-06-29 19:15:08 +05:30
Deepesh Garg
1e5482cedd fix: Revert Changes 2021-06-26 23:49:32 +05:30
Deepesh Garg
3239f774bd
Merge pull request #26183 from deepeshgarg007/item_tax_fetch_fix_develop
fix: User is not able to change item tax template
2021-06-25 10:46:14 +05:30
Deepesh Garg
7b7796c1ed fix: Linting fixes 2021-06-24 21:13:18 +05:30
Deepesh Garg
8cdd7ce7b6 fix: Add python 3 compatible string types 2021-06-24 21:13:10 +05:30
Deepesh Garg
b4b76b75cd
Merge pull request #26176 from deepeshgarg007/item_tax_fetch_fix
fix: User is not able to change item tax template
2021-06-24 19:55:49 +05:30
Deepesh Garg
1658107a92 fix: Linting fixes 2021-06-24 19:18:50 +05:30
Deepesh Garg
e21e435a0d fix: Add python 3 compatible string types 2021-06-24 19:17:58 +05:30
Deepesh Garg
755ebdf582
Update party.js 2021-06-24 17:35:14 +05:30
Deepesh Garg
e693cceb58
Merge pull request #26132 from noahjacob/shipping_address_fix
fix: fetch preferred shipping address
2021-06-24 17:31:21 +05:30
Deepesh Garg
f84f8d5260
Update party.js 2021-06-24 17:29:55 +05:30
Noah Jacob
dbdf2515cd fix: fetches correct preferred shipping address 2021-06-24 17:06:18 +05:30
Deepesh Garg
94d460412a fix: User is not able to change item tax template 2021-06-24 10:39:49 +05:30
Deepesh Garg
03b629c851
Merge pull request #26100 from deepeshgarg007/pi_billing_address
fix: Billing address not fetched in Purchase Invoice
2021-06-24 10:29:01 +05:30
Deepesh Garg
da7f45130b fix: Billing address not fetched in Purchase Invoice 2021-06-24 10:25:24 +05:30
Deepesh Garg
1f7b95f390 fix: User is not able to change item tax template 2021-06-23 20:56:27 +05:30
Noah Jacob
b4b6288596 fix: fetches correct preferred shipping address 2021-06-23 17:05:44 +05:30
Deepesh Garg
673470705b Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into bootstraped_gst_setup 2021-06-23 11:33:15 +05:30
Saqib
fb89008a13
fix(pos): unsupported operand type -=: for 'float' and 'NoneType' (#26097) 2021-06-21 10:49:09 +05:30
Saqib
7ff19ebec8
fix(pos): unsupported operand type -= for 'float' and 'NoneType' (#26096) 2021-06-21 10:48:50 +05:30
Rohit Waghchaure
f0dfea1d47 fix: test case for Project Profitability report 2021-06-20 15:31:25 +05:30
Rohit Waghchaure
110e152fa3 fix: purchase invoice qty change not recalculate the consumed qty and added test cases for purchase invoice 2021-06-20 15:28:23 +05:30
Rohit Waghchaure
6bbc8ec3e8 fix: code cleanup and convert public method to private for subcontracting class 2021-06-20 15:27:04 +05:30
Rohit Waghchaure
5cc3f14506 fix: purchase invoice qty change not recalculate the consumed qty and added test cases for purchase invoice 2021-06-19 23:16:23 +05:30
Rohit Waghchaure
ddb0ec261a fix: code cleanup and convert public method to private for subcontracting class 2021-06-19 23:16:23 +05:30
Deepesh Garg
a58b571ccb fix: Billing address not fetched in Purchase Invoice 2021-06-18 10:45:35 +05:30
Ankush
fd84847f2b
fix: syntax fixes for native class (#26064) 2021-06-16 11:14:40 +05:30
Nabin Hait
0950481253 fix: merge conflict 2021-06-15 20:18:06 +05:30
Himanshu
ec25d5938b
feat(SLA): Apply SLA to any document (#22449) 2021-06-14 19:05:52 +05:30
Ankush Menat
348f04ca82
fix: syntax error in serial/batch selector (#26024) 2021-06-11 21:01:30 +05:30
Nabin Hait
d17217c4e2
Merge pull request #25831 from deepeshgarg007/tds_advance_payment_v13
feat: Tax deduction against advance payments
2021-06-10 20:25:30 +05:30
Deepesh Garg
5434dd048b Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into dynamic_gst_rates 2021-06-10 18:56:39 +05:30
Deepesh Garg
758db793be Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13 2021-06-09 13:39:07 +05:30
Jannat Patel
6b8c123fd9
fix: Quiz timer (#25983)
* fix: quiz timer

* fix: pass time bound parameter

* fix: sider
2021-06-08 18:57:49 +05:30
pateljannat
7ace06ac21 fix: sider 2021-06-08 18:26:23 +05:30
pateljannat
bbf07d9214 fix: quiz timer issues 2021-06-08 17:05:44 +05:30
Deepesh Garg
6f2dacc60c Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13 2021-06-06 19:31:50 +05:30
Deepesh Garg
3646c301ed fix: Linting issues 2021-06-05 13:21:03 +05:30
Deepesh Garg
8a7e283926 feat: Item Taxes based on net rate 2021-06-04 22:53:26 +05:30
Rohan Bansal
a06ec03efc test: add test for new QI function 2021-06-02 14:55:31 +05:30
Rohan Bansal
11aff80dea Merge remote-tracking branch 'upstream/version-13-hotfix' into dev-quality-inspection-accounts 2021-06-02 14:22:32 +05:30
Deepesh Garg
2f5885627d fix: Labeling and other fixes 2021-06-01 11:07:18 +05:30
Nabin Hait
a3d1b6973a fix: merge conflict 2021-05-31 11:21:33 +05:30
Deepesh Garg
4311fdc3a1 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into bootstraped_gst_setup 2021-05-27 17:49:23 +05:30
anushka19
04dfaf3b2a fix: Broken help links fixed 2021-05-27 17:45:37 +05:30