Commit Graph

3953 Commits

Author SHA1 Message Date
rohitwaghchaure
515d8b9e50
Merge pull request #23259 from anupamvs/se-quntity
fix: SE quantity data type issue
2020-09-04 16:07:13 +05:30
Anupam K
faebef21b7 fix: SE quantity data type issue 2020-09-04 15:09:16 +05:30
Rohit Waghchaure
68b0108301 fix: incorrect qty after transaction in stock ledger entry 2020-09-03 15:10:07 +05:30
marination
731bae170e fix: Test for Over Receipt via PRs on a PO 2020-08-28 14:09:02 +05:30
Shivam Mishra
7556517a4f
feat: validate if removed item attributes exist in variants (#22911)
* feat: validate if removed item attributes exist in variants

* Update erpnext/stock/doctype/item/item.py

Co-authored-by: Marica <maricadsouza221197@gmail.com>

* Update erpnext/stock/doctype/item/item.py

Co-authored-by: Marica <maricadsouza221197@gmail.com>

* refactor: smaller loop

Co-authored-by: marination <maricadsouza221197@gmail.com>

* feat: don't run validation for new entries

Co-authored-by: Marica <maricadsouza221197@gmail.com>

* fix: use tuple as is

Co-authored-by: Marica <maricadsouza221197@gmail.com>

* refactor: error description

Co-authored-by: Marica <maricadsouza221197@gmail.com>

* refactor: remove unused variable

Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-08-24 19:37:09 +05:30
rohitwaghchaure
cf4268e21a
Merge pull request #23116 from nabinhait/subcontracted-pr-gle
fix: GLE for subcontracted PR is fg item rate is zero
2020-08-24 16:07:32 +05:30
Deepesh Garg
8331a38ace fix: Test Case for qty less than 1 2020-08-23 21:23:26 +05:30
Deepesh Garg
cb0bc2dcaf fix: Negative SLE not created for fraction qty or qty less than 1 2020-08-23 20:43:50 +05:30
Nabin Hait
337ee0a4bf test: Test case for GLE in subcontracted PR if FG item rate is zero 2020-08-22 20:02:27 +05:30
Nabin Hait
df175cc8fc fix: GLE for subcontracted PR is fg item rate is zero 2020-08-22 19:17:18 +05:30
Anupam Kumar
674d1b0803
feat: Material Request and Stock Entry Enhancement (#22671)
* feat: send to warehouse

* adding warehouse validation

* fix: review changes

* fix: review changes

* stock entry enhancement

* fix: review changes
2020-08-12 17:55:02 +05:30
Rucha Mahabal
e0cc421e50
fix: TypeError while setting transfer_qty in Stock Entry (#22929)
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-08-12 14:33:30 +05:30
Shivam Mishra
2fe5d76fe4
Merge branch 'develop' into item-image-alt 2020-08-11 14:45:55 +00:00
Anupam Kumar
79d731dcd8
feat: Naming series for Sales/Purchase Return (#22942)
* feat: adding return naming series

* Update purchase_invoice.json

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-08-11 16:11:20 +05:30
Shivam Mishra
ded9f41cce
refactor: update confusing label 2020-08-10 12:45:07 +05:30
Shivam Mishra
b1f8859121 feat: add alt value in product page 2020-08-07 14:38:40 +05:30
Shivam Mishra
ba4c4f107e feat: add image alt field in items 2020-08-07 14:34:28 +05:30
Afshan
085061fa21
fix: show or hide section or attributes depending on other attributes… (#22861)
* fix: show or hide section or attributes depending on other attributes for better UI

* Update erpnext/stock/doctype/item/item.js

Co-authored-by: Marica <maricadsouza221197@gmail.com>

* fix: made has_variants checkbox to read_only if stock_exists

Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-08-06 14:36:34 +05:30
Suraj Shetty
1923ef052c
refactor: Format and sanitise user inputs to search queries. (#22913)
* refactor: Sanitize whitelisted method inputs

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* refactor: Format and sanitize tax_account_query inputs

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* refactor: Validate and sanitize search inputs via decorator

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* style: Minor formatting fix

* refactor: Validate and sanitize search inputs using decorator

* fix: Typo

* fix: Remove unwanted import statement

* refactor: Repalce validate_and_sanitize_search_inputs() with validate_and_sanitize_search_inputs

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-08-05 19:42:25 +05:30
Marica
e211bb7a53
fix: Reposition description in Warehouse (#22895) 2020-08-03 20:40:09 +05:30
Marica
dd97524db5
fix: Misleading description in Warehouse (#22877)
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-08-03 14:55:40 +05:30
Prssanna Desai
9e81bb9a11
fix: add range filters to oldest items chart (#22842) 2020-07-29 17:28:30 +05:30
Deepesh Garg
9119b4c538
fix: Unable to submit backdated stock transactions for different items (#22648)
* fix: Unable to submit backdated stock transactions for different items

* fix: Test cases

* fix: Test Cases

* fix: Test Cases

* fix: Test for stock account JV

* fix: Journal Entry Test
2020-07-28 08:49:44 +05:30
Afshan
73b86d241c fix: conversion to float 2020-07-23 21:09:27 +05:30
Afshan
13d2a34548 Merge remote-tracking branch 'upstream' into add-age-range-in-stock-ageing
Merge remote-tracking branch 'upstream' into add-age-range-in-stock-ageing
2020-07-23 20:35:21 +05:30
Afshan
7965f655a2 Merge branch 'add-age-range-in-stock-ageing' of https://github.com/AfshanKhan/erpnext into add-age-range-in-stock-ageing
Merge branch 'add-age-range-in-stock-ageing' of https://github.com/AfshanKhan/erpnext into add-age-range-in-stock-ageing
2020-07-23 20:33:43 +05:30
Afshan
775fbe74c5 fix: fixed the logic 2020-07-23 20:33:07 +05:30
Abhishek Balam
d05a98517d
Fix: Increase Length Of "In Words" and "In Words (Company Currency)" fields (#22732)
* new parent updating logic, made requested changes

* fix: Increase Length of In Words fields

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-07-23 19:01:31 +05:30
Nabin Hait
9389b3625a
Merge branch 'develop' into add-age-range-in-stock-ageing 2020-07-23 18:53:00 +05:30
Saqib
a6f98d48bc
refactor: POS workflow (#20789)
* refactor: add pos invoice doctype replacing sales invoice in POS

* refactor: move pos.py to pos invoice

* feat: add pos invoice merge log doctype

* feat: ability to merge pos invoices into a sales invoice

* feat: [wip] new ui for point of sale

* fix: pos.py moved to pos_invoice

* feat: loyalty points for POS Invoice

* fix: loyalty points on merging

* feat: return against pos invoices

* Merge 'fork/serial-no-selector' into refactor-pos-invoice

* chore: status fix and set warehouse from pos profile

* fix: naming series

* feat: merge pos returns into credit notes

* feat: add pos list action for merging into sales invoices

* feat[UX]: add shortcuts & focus on search after customer selection

* feat: stock validation from previous pos transactions

* Merge 'fork/serial-no-selector' into refactor-pos-invoice

* chore: fix df not found for base_amount precision

* feat: serial no validation from previous pos transactions

* chore: move pos.py into pos page

* feat: pos opening voucher

* feat: link pos closing voucher with opening voucher

* chore: use map_doc instead of get_mapped_doc for better perf

* feat: enforce opening voucher on pos page

* feat: [ui] [wip] point of sale beta ui refactor

* fix: auto fetching serial nos with batch no

* feat: [ui] item details section for new pos ui

* feat: remove item from cart

* refactor: [ui] [wip] split point_of_sale into components
* new payment component
* new numberpad
* fix pos opening status
* move from flex to grids

* fix: search from item selector

* feat: loyalty points as payment method

* feat: pos invoice status
* fix a bug with invalid JSON

* fix: loyalty program ui fixes

* feat: past order list and past order summary

* feat: (minor) setting discount from item details

* fix: adding item before customer selection

* feat: post order submission summary
* save and open draft orders
* fix: item group filter

* fix:  item_det not defined while submitting sle

* fix: minor bugs

* fix: minor ux fixes

* feat: show opening time in pos ui

* feat: item and customer images

* feat: emailing and printing an invoice

* fix: item details field edit shows empty alert

* fix: (minor) ux fixes

* chore: rename pos opening voucher to pos opening entry

* chore: (minor) rename pos closing voucher and sub doctypes

* chore: add patch for renaming pos closing doctypes

* fix: negative stock not allowed in pos invoices* default is_pos in pos invoices* fix: transalation

* fix: invoices not getting fetched on pos closing

* fix: indentation

* feat: view / edit customer info

* fix: minor bugs

* fix: minor bug

* fix: patch

* fix: minor ux issues

* fix: remove uppercase status

* refactor: pos closing payment reconciliation

* fix: move pos invoice print formats to pos invoice doctype

* fix: ui issues

* feat: new child doctype to store pos payment mode details

* fix: add to patches.txt

* feat: search by serial no

* chore: [wip] code cleanup

* fix: item not selectable from cart

* chore: [wip] code cleanup

* fix: minor issues
* loyalty points transactions
* default payment mode

* fix: minor fixes
* set correct mop amount with loaylty points
* editing draft invoices from UI

* chore: pos invoice merge log tests

* fix: batch / serial validation in pos ui and on submission

* feat: use onscan js for barcode scan events

* fix: cart header with amount column

* fix: validate batch no and qty in pos transactions

* chore: do not fetch closing balances as opening balance

* feat: show available qty in item selector

* feat: shortcuts

* fix: onscan.js not found

* fix: onscan.js not found

* fix: cannot return partial items

* fix: neagtive stock indicator

* feat: invoice discount

* fix: change available stock on warehouse change

* chore: cleanup code

* fix: pos profile payment method table

* feat: adding same item with different uom

* fix: loyalty points deleted after consolidation

* fix: enter loyalty amount instead of loyalty points

* chore: return print format

* feat: custom fields in pos view

* chore: pos invoice test

* chore: remove offline pos

* fix: cyclic dependency

* fix: cyclic dependency

* patch: remove pos page and order fixes

* chore: little fixes

* fix: patch perf and plural naming

* chore: tidy up pos invoice validation

* chore: move pos closing to accounts

* fix: move pos doctypes to accounts

* fix: move pos doctypes to accounts

* fix: item description in cart

* fix: item description in cart

* chore: loyalty tests
* minor fixes

* chore: rename point of sale beta to point of sale

* chore: reset past order summary on filter change

* chore: add point of sale to accounting desk

* fix: payment reconciliation table in pos closing

* fix: travis

* Update accounting.json

* fix: test cases

* fix: tests
* patch loyalty point entries

* fix: remove test
* default mode of payment is mandatory for pos transaction

* chore: remove unused checks from pos profile

* fix: loyalty point entry patch

* fix: numpad reset and patches

* fix: minor bugs

* fix: travis

* fix: travis

* fix: travis

* fix: travis

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-07-23 18:51:26 +05:30
Marica
3c8c346227
fix: Pick List empty table and Serial-Batch items handling (#22426)
* chore: Pick List empty table and serial-batch items handling

* fix: Remove console statement

* chore: Added tests for batched and batched-serialised item
2020-07-23 17:52:06 +05:30
Afshan
767ee1cdb8 fix: logic to get other items also other than just 1st one 2020-07-23 15:39:27 +05:30
rohitwaghchaure
d45ff31ff0
fix: incorrect stock after merging the items (#22526)
* fix: incorrect stock after merging items

* fix: Readability fix

Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-07-22 18:24:01 +05:30
Marica
514366654e
fix: Serial No Rename does not affect Stock Ledger Entry (#22746)
* Revert "fix: Remove rename related code from Serial No (#22627)"

This reverts commit 1ec2d962db.

* fix: Rename fails on Stock Ledger Entry

* fix: Allow Rename in Serial No
2020-07-22 16:40:24 +05:30
Marica
53646cb360
chore: Export Stock Dashboard (#22768) 2020-07-22 16:17:40 +05:30
Afshan
871889220b
style: moved parent warehouse to top section also added a section bre… (#22708)
* style: moved parent warehouse to top section also added a section break for better look

* style: changes display depends on for HTML field

Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-07-21 20:39:00 +05:30
Afshan
66d4b42df0
fix: update set query for warehouse after changing the company (#22632)
* fix: update set query for warehouse after changing the company

* fix: changed set_query to get_query

* fix: variable filter doesn't get updated once set on load hence removed

Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-07-21 19:59:30 +05:30
rohitwaghchaure
f4db8c1c11
Merge pull request #22724 from rohitwaghchaure/fixed-incorrect-currency-symbol-in-stock-balance-report-develop
fix: currency symbol not showing as per company currency in stock balance report
2020-07-17 16:56:22 +05:30
Rohit Waghchaure
2347e69cb9 fix: for past dated stock reco, batched item showing the current available qty instead of quantity as per posting date 2020-07-17 14:50:49 +05:30
Rohit Waghchaure
848568d023 fix: currency symbol not showing as per company currency in stock balance 2020-07-17 14:49:12 +05:30
michellealva
d02465a68f fix: Update modified timestamp for Delivery Note Item 2020-07-17 10:35:16 +05:30
Rohit Waghchaure
132376750c fix: incorrect balance qty in stock ledger report 2020-07-15 17:23:17 +05:30
rohitwaghchaure
30030230bf
Merge pull request #22675 from marination/material-request-warehouse
fix: Dont overwrite default warehouse in Material Request
2020-07-15 15:35:38 +05:30
Rohit Waghchaure
e1b3f16abd fix: project field added two time in purchase receipt 2020-07-15 12:28:19 +05:30
marination
392f323d2d fix: Dont overwrite default warehouse in Material Request 2020-07-14 17:03:17 +05:30
Marica
82a606d04b
fix: Added Project Field in Purchase Receipt for Stock Ledger Tagging (#22666) 2020-07-14 13:16:28 +05:30
rohitwaghchaure
ac984eb37c
Merge branch 'develop' into project-link-for-all-accounts 2020-07-13 11:50:11 +05:30
Afshan
ccf6b5f640 Merge remote-tracking branch 'upstream/develop' into add-age-range-in-stock-ageing
Merge remote-tracking branch 'upstream/develop' into add-age-range-in-stock-ageing
2020-07-13 11:45:33 +05:30
Deepesh Garg
8cdf33f618
Merge pull request #22635 from deepeshgarg007/item_tax_test
fix(travis): Item Tax template test
2020-07-11 21:04:31 +05:30
Deepesh Garg
46bcb46422 fix: Do not use random customers 2020-07-11 18:36:32 +05:30