Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
36,356 Commits 3 Branches 0 Tags 1 GiB
a9c84f749a
Commit Graph

4528 Commits

Author SHA1 Message Date
Ankush Menat
36ff0748bf
fix: broken type check in stock ageing report 2021-04-05 10:18:44 +05:30
Walstan Baptista
b7481633b1
test: adds role after setting user to Administrator (#25177) 2021-04-03 17:37:59 +05:30
Deepesh Garg
232c127295
Merge pull request #25107 from deepeshgarg007/stock_entry_serial_batch_selector 
fix: Hide serial and batch selector in Stock Entry
 2021-04-03 17:15:22 +05:30
rohitwaghchaure
fe72e17a7b
Merge pull request #25109 from ankush/po_to_pr_fixes 
fix: incorrect status creating PR from PO after creating PI
 2021-04-03 17:11:14 +05:30
Marica
7f9fedf08a
Merge branch 'develop' into fix_picked_qty_in_DN 2021-04-02 13:19:19 +05:30
Anuja Pawar
87dea3923b
fix: Picked Qty conversion from Stock Qty to Qty while creating DN from Pick List (#25106) 
* fix: picked qty from Stock Qty to Qty in DN

* fix: suggested changes and added test

* fix: sider changes

* fix: sider changes
 2021-04-01 22:05:08 +05:30
Marica
913e7254cb
Merge branch 'develop' into qc-back-update 2021-04-01 17:40:46 +05:30
Walstan Baptista
446a6df662
test: set opening stock to fix NegativeStock errors (#25101) 
Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2021-04-01 16:54:26 +05:30
Anuja P
7982688508 fix: sider changes 2021-04-01 16:04:28 +05:30
marination
a3da206b64 fix: Don't string format args as they may not be escaped properly 
- Append even conditional args to args list and send to query executer
- It will escape all values that are sent to it
- String formatting without escaping causes issues with % sign, etc.
 2021-04-01 15:45:33 +05:30
Anuja P
45d0b9bce6 test: added tests for Pick List for item with multiple UOM 2021-04-01 15:38:13 +05:30
Rucha Mahabal
6717773c28
fix: Travis (#25078) 
* fix(test): set default accounts in mode of payment

* fix(test): import_doc params in shopify settings test

* fix: syntax error in salary slip test

* fix(test): use Temporary Opening account for Stock Reco opening entry

* fix(test): skip GST doc naming validations for tests

* fix(test): Salary Structure Assignment date edge case

* fix(test): GST doc naming validations

* fix: sider

* revert: skip GST doc naming validations for tests
 2021-04-01 15:30:34 +05:30
Nabin Hait
11eb30d082 fix: merge conflict 2021-04-01 15:03:11 +05:30
marination
561fa6b530 fix: Don't string format args as they may not be escaped properly 
- Append even conditional args to args list and send to query executer
- It will escape all values that are sent to it
- String formatting without escaping causes issues with % sign, etc.
 2021-04-01 12:56:05 +05:30
Ankush Menat
8993ccb7d2
fix: update PR status in database 2021-04-01 11:51:31 +05:30
Ankush Menat
4198cf58e5
test: add tests for PO->PI, PO->PR workflow 
Add failing test cases for PR status and PR percent billed.
 2021-04-01 11:51:30 +05:30
rohitwaghchaure
56bd4d71a9
Merge pull request #25112 from rohitwaghchaure/fixed-clear-source-warehouse 
fix: not able to save material request
 2021-03-31 23:58:44 +05:30
Rohit Waghchaure
825850a58f fix: not able to save material request 2021-03-31 23:55:06 +05:30
Marica
bfc2590e3b
Merge branch 'develop' into patch-7 2021-03-31 22:23:23 +05:30
Marica
8617c0ab99
Merge pull request #25070 from marination/update-items-bin 
fix: Update Bin via Update Item on Purchase/Sales Order
 2021-03-31 22:21:41 +05:30
Deepesh Garg
9f7bb14ea1 fix: Remove console 2021-03-31 20:01:00 +05:30
Anuja P
a1d0932093 fix: suggested changes 2021-03-31 19:59:28 +05:30
Deepesh Garg
2d86eb3ab1 fix: Hide serial and batch selector in Stock Entry 2021-03-31 19:57:50 +05:30
Anuja P
fb9ce3f37b fix: Picked Qty conversion from Stock Qty to item Qty in DN 2021-03-31 19:26:42 +05:30
Prssanna Desai
9920d4062c
Merge pull request #25103 from prssanna/redesign-fixes-v13 2021-03-31 19:02:10 +05:30
Anupam Kumar
526497bc43
Merge pull request #25104 from anupamvs/purchase-side-margin-beta 
feat: price margin in buying
 2021-03-31 18:38:58 +05:30
Anupam
ad520e08ba feat: price margin in buying 2021-03-31 18:31:12 +05:30
prssanna
bcd63f04da style: missing semicolon 2021-03-31 18:26:52 +05:30
prssanna
5cdb1cb7a9 fix: item variant dialog dropdown issue 2021-03-31 18:26:45 +05:30
Jannat Patel
c814aab0b6
fix: delivery note print error (#25081) 2021-03-31 16:24:31 +05:30
Jannat Patel
11e9ae3841
fix: delivery note print error (#25080) 2021-03-31 16:24:08 +05:30
Marica
1b8d36634f
Merge branch 'develop' into patch-7 2021-03-31 16:04:24 +05:30
Saqib
4d0939de8d
feat: introduce parameter group in quality inspection (#25094) 
* feat: introduce parameter group in quality inspection

* chore: make parameter group optional
 2021-03-31 15:51:48 +05:30
rohitwaghchaure
e353c84aa5
Merge pull request #25092 from rohitwaghchaure/fixed-multiply-issue-material-request-develop 
fix: can't multiply sequence by non-int of type 'float'
 2021-03-31 15:31:50 +05:30
rohitwaghchaure
968885af26
Merge pull request #25091 from rohitwaghchaure/fixed-multiply-issue-material-request 
fix: can't multiply sequence by non-int of type 'float'
 2021-03-31 15:31:30 +05:30
Rohit Waghchaure
1bc53a32bf fix: can't multiply sequence by non-int of type 'float' 2021-03-31 15:30:42 +05:30
Rohit Waghchaure
94c145f3c3 fix: can't multiply sequence by non-int of type 'float' 2021-03-31 15:28:26 +05:30
Sagar Vora
e50324aed7
perf: reduce number of queries for checking if future SL entry exists (#25064) 2021-03-31 12:44:03 +05:30
Walstan Baptista
d6360755b9
chore: frappe.whitelist for doc methods (#25068) 
* chore: frappe.whitelist for doc methods

* fix: incorrect spelling

* fix: sider issue

Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2021-03-31 12:30:32 +05:30
Anupam
41229ba705 fix: unable to submit stock entry 2021-03-31 02:32:25 +05:30
marination
a5de6c779b fix: Cleaned up and fixed validation and bin updation on deletion 
- Created separate smaller functions for validation and bin updation of deleted row
- Made sure previous doc (linked doc) was also updated after deletion of row
- Tests to check bin updation on add/update/delete
- Made reserved qty for subcontrating read only in bin
 2021-03-31 02:03:26 +05:30
marination
0673f558c1 fix: Cleaned up and fixed validation and bin updation on deletion 
- Created separate smaller functions for validation and bin updation of deleted row
- Made sure previous doc (linked doc) was also updated after deletion of row
- Tests to check bin updation on add/update/delete
- Made reserved qty for subcontrating read only in bin
 2021-03-31 01:42:18 +05:30
Anupam Kumar
9be11afbde
feat: price margin in buying (#25058) 2021-03-30 12:09:46 +05:30
Walstan Baptista
ee822a9dcd
test: use different product attribute value; cleanup (#25043) 
Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2021-03-27 19:42:25 +05:30
Walstan Baptista
d6c7d8e631
test: reset session user if test errors in test_sle (#25042) 2021-03-27 18:30:07 +05:30
Sagar Vora
868c0bf45b
perf: reduce no of queries for checking if future sl entry exists (#24881) 2021-03-27 16:10:20 +05:30
Anupam
4adaf7ed2e Merge branch 'version-13-beta-pre-release' of https://github.com/frappe/erpnext into naming-pre-release 2021-03-27 00:56:48 +05:30
Anupam
5d994d8aa1 fix: unable to submit stock entry 2021-03-27 00:54:19 +05:30
Anupam
096da429ed fix: unable to submit stock entry 2021-03-27 00:45:31 +05:30
rohitwaghchaure
d5759bab11
Merge pull request #24922 from rohitwaghchaure/feat-recursice-pricing-rule 
feat: recursive pricing rule
 2021-03-26 19:10:10 +05:30
Rohit Waghchaure
256b9c7bf9 fix: total weight not set for free items 2021-03-26 19:05:46 +05:30
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
Rohit Waghchaure
244f3eeedc fix: incorrect fieldname 2021-03-24 16:42:22 +05:30
Anurag Mishra
4217a4b1ff
Merge branch 'develop' into item-dashboard-fixes 2021-03-24 15:35:33 +05:30
Anupam Kumar
d1bbb4c311
Merge branch 'develop' into planning 2021-03-24 15:12:04 +05:30
rohitwaghchaure
3c490088c4
Merge pull request #24991 from rohitwaghchaure/repost-not-completed-transactions-pre 
fix: repost not completed backdated transactions
 2021-03-24 12:38:42 +05:30
Rohit Waghchaure
9165327cf6 fix: repost not completed backdated transactions 2021-03-24 11:32:26 +05:30
rohitwaghchaure
575f8f226b
fix: repost not completed backdated transactions (#24980) 2021-03-24 11:30:53 +05:30
Ankush Menat
2ba198576c
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 14:03:09 +05:30
Ankush Menat
2a391298a7
test: customer item in stock reconciliation 2021-03-23 14:03:00 +05:30
Ankush Menat
6a534ea82b
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 14:02:52 +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
Rohit Waghchaure
bde159a77d fix: total weight not set for free items 2021-03-22 23:36:48 +05:30
Anupam
661b1e59c1 Merge branch 'develop' of https://github.com/frappe/erpnext into planning 2021-03-22 11:48:11 +05:30
Anupam
4980dd616b fix: resolving commits 2021-03-22 11:23:47 +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
rohitwaghchaure
98a40d81d5
Merge pull request #24957 from rohitwaghchaure/revert-stock-balance-value-calculation-v13-pre 
fix: revert stock balance value calculation
 2021-03-19 16:22:51 +05:30
rohitwaghchaure
081499c0c0
Merge pull request #24956 from rohitwaghchaure/revert-stock-balance-value-calculation-develop 
fix: revert stock balance value calculation
 2021-03-19 16:22:13 +05:30
Rohit Waghchaure
67d94ac0cc fix: revert stock balance value calculation 2021-03-19 16:21:30 +05:30
Rohit Waghchaure
f21a55c8ef fix: revert stock balance value calculation 2021-03-19 16:19:34 +05:30
Ankush Menat
c0a9c391eb
fix: hide alt tag if item is not shown in website 2021-03-18 14:07:24 +05:30
Anurag Mishra
abf974daee fix: precision and formated document 2021-03-17 18:55:04 +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
Rohit Waghchaure
00a0e8da10 fix: validation of job card in stock entry 2021-03-15 14:15:10 +05:30
Anupam Kumar
ed42afc5e8
feat: price margin in buying (#24685) 2021-03-15 11:11:28 +05:30
Nabin Hait
fe3529b194 fix: merge conflict 2021-03-11 16:45:41 +05:30
rohitwaghchaure
a0e7787f7b
fix: removed show cancelled entries checkbox from the stock ledger report (#24826) 2021-03-10 13:46:42 +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
Rohit Waghchaure
535406cb0c fix: allow to select item code in batch naming 2021-03-09 21:01:12 +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
d96be3f9f1
Reposting patch and earned leave rounding (#24783) 
* fix: rounding of earned leave is optional (#24782)

* fix: reposting patch fixes (#24775)
 2021-03-02 17:02:47 +05:30
Nabin Hait
bd10d7c028
fix: reposting patch fixes (#24775) 2021-03-02 13:37:45 +05:30
Deepesh Garg
236a232de0
Merge pull request #24769 from rohitwaghchaure/allow-to-set-item-in-batch-naming 
fix: allow to select item code in batch naming
 2021-03-01 20:25:14 +05:30
Rohit Waghchaure
eb6b3cfe6d fix: allow to select item code in batch naming 2021-03-01 11:32:39 +05:30
Rohit Waghchaure
9f13a060f0 fix: reposting patch 2021-02-26 17:44:54 +05:30
Rohit Waghchaure
c603fd638b fix: reposting patch 2021-02-26 17:42:52 +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
39b5ad8e69 fix: patch failing because of incorrect gl entries 2021-02-23 18:35:36 +05:30
Rohit Waghchaure
bc8c9de26d fix: patch failing because of incorrect gl entries 2021-02-23 18:26:48 +05:30
Nabin Hait
d46b23699c
fix: optimize reposting of gle and sle (#24702) 
* fix(india): escape for special characters in JSON (#24695)

JSON does not accept special whitespace characters like tab, carriage
return, line feed

Ref: https://www.ecma-international.org/wp-content/uploads/ECMA-404_2nd_edition_december_2017.pdf

Related issue: ISS-20-21-09811

* fix: Accounting Dimension creation background job timeout

* fix(regional): vehicle no is mandatory for ewaybill generation (#24679)

* fix: vehicle no required for e-invoice

* fix: ewaybill generation dialog condition

* fix: excluding unidentified accounts from gstr-1

* fix: optimize reposting of sle and gle (#24694)

* fix: optimize update_gl_entries_after method

* fix: Optimized reposting patch

* fix: accounting dimensions

* added reload_doc in patch

* Update item_reposting_for_incorrect_sl_and_gl.py

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>

* fix: Replaced spaces with tabs

* fix: merge conflict

* fix: test cases

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
Co-authored-by: pateljannat <pateljannat2308@gmail.com>
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2021-02-23 16:38:52 +05:30
Nabin Hait
19f8fa59d3
fix: optimize reposting of sle and gle (#24694) 
* fix: optimize update_gl_entries_after method

* fix: Optimized reposting patch

* fix: accounting dimensions

* added reload_doc in patch

* Update item_reposting_for_incorrect_sl_and_gl.py

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2021-02-22 22:27:22 +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
Anupam Kumar
b1997da488 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-18 21:32:05 +05:30
Nabin Hait
186a045e28 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 21:28:28 +05:30
Nabin Hait
deddcc513d 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-18 21:28:16 +05:30
Nabin Hait
f2be0805f7 fix: formatting query args (#24627) 2021-02-18 21:25:59 +05:30
rohitwaghchaure
83792ec009 fix: reposting issue with same posting date and posting time (#24570) 
* fix: reposting issue with same posting date and posting time

* Update erpnext/stock/stock_ledger.py

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-02-18 21:24:48 +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
Nabin Hait
243661b37b
fix: formatting query args (#24627) 2021-02-15 19:27:49 +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
rohitwaghchaure
aa00eb9898
fix: reposting issue with same posting date and posting time (#24570) 
* fix: reposting issue with same posting date and posting time

* Update erpnext/stock/stock_ledger.py

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-02-11 13:23:01 +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
Nabin Hait
b58b8ec2fb
Merge branch 'develop' into quality-inspection-parameter-group 2021-02-11 11:14:02 +05:30
marination
a97eb6a052 fix: Empty State text font weight in Item Dashboard 2021-02-07 22:27:40 +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
Nabin Hait
243d59b0c3
Reposting logic fixes (#24520) 
* fix: Dependant sle logic fixes

* fix: negative qty validation

* fix: Travis fixes

* fix: test fix
 2021-02-02 16:55:13 +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
Marica
003ae90e12
fix: Numeric/Non-numeric QI UX (#24517) 
* 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:32 +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
Rohit Waghchaure
aeba3d311c fix: extra transferred qty has not consumed against work order 2021-01-29 12:33:09 +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
Nabin Hait
a6213ccd61 Merge branch 'develop' into version-13-beta-pre-release 2021-01-28 17:36:08 +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
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
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
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
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
Deepesh Garg
a0d61524c1 fix: Add distribute manually option in LCV 2021-01-26 17:05:00 +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
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
Suraj Shetty
0c34a711eb Merge branch 'develop' of github.com:frappe/erpnext into version-13-beta-pre-release 2021-01-25 16:06:38 +05:30
Marica
62a1caf6c4
Merge branch 'develop' into lcv_multicurrency 2021-01-25 12:39:16 +05:30
Afshan
96edfd93c9 fix: stock ageing should not take cancelled stock entries. 2021-01-21 18:22:35 +05:30
prssanna
9f1a156307 Merge branch 'shopping-cart' of https://github.com/frappe/erpnext into rebrand-ui 2021-01-21 13:04:58 +05:30
Deepesh Garg
60a8ba5cbd Merge branch 'develop' of https://github.com/frappe/erpnext into lcv_multicurrency 2021-01-20 10:30:52 +05:30
Suraj Shetty
bbc6bfd3c3 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2021-01-19 09:34:06 +05:30
marination
957615bec8 fix: Stricter validations 
- Validation for overreceipt on Purchase Invoice, Stock Entry, Purchase Receipt & Stock Reconciliation
- Every incoming stock transaction must be checked to avoid overcapacity
- However application of rule and splitting only on certain doctypes
- Validate capacity < stock balance on save in putaway rule, irrespective
 2021-01-18 23:47:24 +05:30
Marica
6ac51edc56
Merge branch 'develop' into putaway 2021-01-18 17:47:25 +05:30
Deepesh Garg
cbed6f970a Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters 2021-01-15 15:43:59 +05:30
Marica
17614c9860
Merge branch 'develop' into mr-se-warehouse-validation 2021-01-14 13:02:45 +05:30
marination
814858061f fix: test for raising MR-SE mismatch error 
- Make test add mismatched item code instead of warehouse, since warehouse can be different.
 2021-01-14 12:13:08 +05:30
Rohit Waghchaure
56c7b554a6 fix: extra transferred qty has not consumed against work order 2021-01-14 11:54:32 +05:30
Anuja Pawar
e62ce4b172
fix: Add button PO, PI, SI, DN and, Quotation Dashboard (#24187) 2021-01-13 21:13:12 +05:30
Marica
b8c5cd7331
Merge branch 'develop' into mr-se-warehouse-validation 2021-01-12 20:16:58 +05:30
Marica
30cc040d50
Merge branch 'develop' into batch-selector 2021-01-12 20:14:35 +05:30
Anupam
c53ad88503 fix: resolved commit 2021-01-12 10:51:29 +05:30
Rushabh Mehta
7619d3d6d6 fix(merge): develop 2021-01-12 09:16:21 +05:30
Marica
aef71a8abe
Merge branch 'develop' into batch-selector 2021-01-11 14:22:11 +05:30
marination
7646d7b741 fix: Batch/Serial Selector for Batched Item 2021-01-11 12:51:15 +05:30
Marica
b9d5ae9285
Merge branch 'develop' into qi-ux 2021-01-08 20:28:28 +05:30
marination
b7637f49cd fix: Remove QI link on cancel wherever same QI name exists 2021-01-08 18:35:49 +05:30
marination
c4963bfdb2 fix: Back Update from QC based on Batch No 2021-01-08 09:56:04 +05:30
marination
ff6ee9d4e7 fix: Formula field description and Rearrange grid view 
- Missing closing quote in Formula field description
- In grid view of child table in QI, show only input fields
 2021-01-08 09:14:43 +05:30
Marica
d91c7e2b38
Merge branch 'develop' into mr-se-warehouse-validation 2021-01-07 15:41:21 +05:30
Marica
eab1867235
Merge branch 'develop' into qi-ux 2021-01-05 14:23:05 +05:30
Saqib
60460a6d23
fix(e-invoicing): minor calculation fixes (#24282) 2021-01-05 13:54:04 +05:30
Saqib
1f591ab02e
fix(e-invoicing): minor calculation fixes (#24285) 2021-01-05 13:53:51 +05:30
marination
b8aeb9ea88 fix: Indentation and missing semi-colon 
- Fix incorrect indentation after merge conflict
- Sider
 2021-01-05 12:16:25 +05:30
Marica
41ea77ce31
Merge branch 'develop' into putaway 2021-01-05 11:24:05 +05:30
Marica
099162814c
Merge branch 'develop' into qi-ux 2021-01-05 09:27:40 +05:30
marination
0c883853b3 fix: Dont validate warehouse values between MR to Stock Entry 
- Remove validation thta checks if warehouse in Stock Entry is the same as MR that it was pulled from
 2021-01-04 18:48:50 +05:30
Anupam
27fd9e4d7d fix: added empty value in Quality Inspection Reading status 2021-01-04 18:18:00 +05:30
marination
7877d5a7c2 fix: Create QI Parameters (links) in test cases 2021-01-04 11:10:04 +05:30
Rohit Waghchaure
16bce49f18 fix: incorrect valuation rate for finished good 2020-12-31 17:39:52 +05:30
Deepesh Garg
23ab5c5cc0 fix: Multiplle sider issues 2020-12-31 11:29:06 +05:30
Deepesh Garg
133ce286f9 Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters 2020-12-31 11:24:14 +05:30
rohitwaghchaure
b09ddc4672
Merge pull request #24233 from rohitwaghchaure/back-dates-allow-field-issue 
fix: option name for the field 'Role Allowed to Create/Edit Back-dated Transactions'
 2020-12-29 17:52:43 +05:30
Rohit Waghchaure
81285204dc fix: option name for the field 'Role Allowed to Create/Edit Back-dated Transactions' 2020-12-29 16:25:45 +05:30
Deepesh Garg
4a8c2c4cb5 Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters 2020-12-29 15:10:36 +05:30
marination
a69e81a151 chore: Made 'Parameter' a link field in QI and QI Template 
- Added doctype Quality Inspection Parameter
- Made 'Parameter' a link field in QI and QI Template
- Added patch to create Quality Inspection Parameter records for every parameter in the system
 2020-12-28 18:07:22 +05:30
marination
29a03bd5a1 feat: Add 'Manual Inspection' checkbox 
- fix merge conflict in js file
- Dont auto set status if manual inspection is checked
- Added 'Manual Inspection' checkbox in QI readings table
 2020-12-28 16:59:13 +05:30
Marica
62f9cc6c5a
Merge branch 'develop' into qi-ux 2020-12-28 15:09:15 +05:30
Rohit Waghchaure
40d2c6a0cc fix: finished good produced qty validation 2020-12-28 14:08:45 +05:30
Deepesh Garg
d3814b2676 Merge branch develop into batch-wise-pricing 2020-12-28 10:48:29 +05:30
Deepesh Garg
d4fc451c2a
Merge pull request #24191 from nextchamp-saqib/accounting-entries-for-asset 
fix: accounting entries of asset when submitting purchase receipt
 2020-12-26 19:14:32 +05:30
Deepesh Garg
4f8da4c313 fix: Test Cases 2020-12-26 11:37:51 +05:30