Sagar Vora
0b569b3e43
fix: allow creating stock entry based on work order for customer provided items ( #24885 )
2021-03-26 14:40:15 +05:30
Marica
7c6f72fd39
Merge branch 'develop' into hide_alt_field
2021-03-25 12:15:58 +05:30
rohitwaghchaure
575f8f226b
fix: repost not completed backdated transactions ( #24980 )
2021-03-24 11:30:53 +05:30
Ankush Menat
e76ecb8f74
fix: set valuation rate for customer items to zero
...
- In stock reconciliation always set valuation rate of customer provided
items to zero during validation.
- Let user know the valuation has been changed.
2021-03-23 13:01:21 +05:30
Ankush Menat
714b780868
test: customer item in stock reconciliation
2021-03-23 12:43:02 +05:30
Ankush Menat
762d6e38f7
fix: Allow zero valuation in stock reconciliation
...
Stock reconciliation can not be done for customer provided item as they
have zero valuation. This change adds a checkbox in item table to allow
such items.
Related issue: ISS-20-21-10248
2021-03-23 11:18:04 +05:30
Sagar Vora
a85959f574
fix: remove unwanted parameter in calculate_rate_and_amount ( #24883 )
...
* fix: remove unwanted parameter in calculate_rate_and_amount
* fix: translation syntax
2021-03-20 16:37:33 +05:30
Ankush Menat
c0a9c391eb
fix: hide alt tag if item is not shown in website
2021-03-18 14:07:24 +05:30
prssanna
1cdef8bd97
style: missing semicolon
2021-03-16 15:39:16 +05:30
prssanna
b8b89a02af
fix: item variant dialog dropdown issue
2021-03-16 14:16:22 +05:30
Anurag Mishra
5e475f85b9
Merge branch 'develop' into suplier_portal_fixes
2021-03-15 16:21:55 +05:30
Anupam Kumar
ed42afc5e8
feat: price margin in buying ( #24685 )
2021-03-15 11:11:28 +05:30
Raffael Meyer
20cc2bb0d8
fix: autoname for Item Tax Template
...
* fix: autoname for Item Tax Template
Use title + company abbreviation instead of just title.
* fix: test records of Item Tax Template
* fix: rename item tax templates in test records
* Revert "fix: test records of Item Tax Template"
This reverts commit 53875c54ffe059c32d52b9ee60795d56f95473b1.
* fix: rename hardcoded item tax templates in tests
* fix: rename hardcoded Item Tax Templates in tests
(2)
* fix: delete Item Tax Template with company
2021-03-10 10:24:43 +05:30
Anupam Kumar
832098f042
fix: In-Transit Feature enhancements ( #24652 )
2021-03-09 21:14:25 +05:30
Sagar Vora
78777d6ed4
fix: fetch Material Requests of type Customer Provided in Stock Entry using Get Items From ( #24756 )
...
Co-authored-by: walstanb <walstanb@gmail.com>
2021-03-09 20:35:08 +05:30
Afshan
9f6015a4e9
fix: batch no in POS ( #24771 )
...
* fix: batch no in list
* fix: check for batch no to be list
2021-03-09 20:31:14 +05:30
Marica
e1ee9034ef
Merge branch 'develop' into item-attribute-fix
2021-03-09 18:35:44 +05:30
Nabin Hait
bd10d7c028
fix: reposting patch fixes ( #24775 )
2021-03-02 13:37:45 +05:30
Rohit Waghchaure
eb6b3cfe6d
fix: allow to select item code in batch naming
2021-03-01 11:32:39 +05:30
Anurag Mishra
02f50a93e5
fix: copy variants property and Attributes whil duplicatinh item Tamplate ( #24662 )
2021-02-25 18:47:17 +05:30
Anuja Pawar
118a4ffb08
fix: rounding error in finished goods qty ( #24653 )
2021-02-25 18:44:44 +05:30
Rohit Waghchaure
bc8c9de26d
fix: patch failing because of incorrect gl entries
2021-02-23 18:26:48 +05:30
shariquerik
f5d6bd77e5
fix: item attributes not editable until refresh
2021-02-22 21:27:14 +05:30
Afshan
133ebc1d51
Merge branch 'develop' into fix-valuation-errror-customer-provided
2021-02-22 14:16:33 +05:30
Marica
4a1ffcf742
Merge branch 'develop' into quality-inspection-parameter-group
2021-02-22 11:34:34 +05:30
Afshan
01b4ee8a3c
Merge branch 'develop' into fix-valuation-errror-customer-provided
2021-02-22 11:17:45 +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
Marica
77d72d59ef
Merge branch 'develop' into quality-inspection-parameter-group
2021-02-18 16:55:44 +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
Anurag Mishra
5ec592d09c
fix: supplier was not able to Submit RFQ due to in sufficient permission
2021-02-18 13:42:04 +05:30
Marica
208d1942c3
Merge branch 'develop' into quality-inspection-parameter-group
2021-02-17 12:56:35 +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
Afshan
e963362dfd
fix: check if customer provided item while setting opening stock
2021-02-15 15:00:37 +05:30
Saqib Ansari
138e98fef2
Merge branch 'develop' into quality-inspection-parameter-group
2021-02-12 11:19:25 +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
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
Saqib Ansari
8c3da162ba
feat: introduce parameter group in quality inspection
2021-02-04 19:39:41 +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
Suraj Shetty
54a253616a
Merge pull request #24508 from frappe/rebrand-ui
2021-02-02 09:07:35 +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
Suraj Shetty
055b81da7b
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2021-02-01 15:10:52 +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
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
Marica
56c6805d79
Merge branch 'develop' into fixed-extra-trasnferred_qty_issue-develop
2021-01-28 15:03:15 +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
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