nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-01 15:47:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,789 Commits 619 Branches 1,804 Tags
3fdabe75d3e9830e8012b91f5e360fc73c6a25e6
Commit Graph

3801 Commits

Author SHA1 Message Date
rohitwaghchaure
968cb60010 Merge pull request #23430 from prssanna/mr-stock-uom 
fix: set stock UOM in item while creating material request from stock entry
 2020-09-24 20:05:20 +05:30
prssanna
92c1f38c33 fix: set stock uom in tem while creating material request from stock entry 2020-09-24 17:08:22 +05:30
Rohit Waghchaure
9e3764ab62 refactor: book loss amount in the COGS instead of stock received but not billed 2020-09-23 19:35:49 +05:30
rohitwaghchaure
07b1737351 Merge pull request #23396 from anupamvs/batch-wise-filter-v12 
fix: adding filters validation Batch-Wise Balance History
 2020-09-23 00:58:11 +05:30
Afshan
38000aacc5 fix: warehouse address filtered based on warehouse (#23381) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-09-22 16:51:58 +05:30
Anupam
ba271317c7 fix: adding filters validation Batch-Wise Balance History 2020-09-22 13:45:15 +05:30
rohitwaghchaure
1b8006be5c Merge pull request #23366 from rohitwaghchaure/fix-stock-reco-with-serial-nos 
fix: stock reconciliation, incorrect serial nos fetched in the current serial no field
 2020-09-21 12:49:31 +05:30
Rohit Waghchaure
f5fd2cd4a2 fix: stock reconciliation, incorrect serial nos fetched in the current serial no field 2020-09-21 01:20:00 +05:30
Saqib
3748cbb32c fix: depreciation start date ux fixes (#23340) 2020-09-20 19:31:46 +05:30
rohitwaghchaure
bea5e5b1bc fix: consumed qty logic for subcontracted raw materials (#23314) 
* fix: consumed qty logic for subcontracted raw materials

* added test case

* fix: sales order workflow test case
 2020-09-15 19:40:37 +05:30
rohitwaghchaure
bb905ca4b0 fix: incorrect calculation for consumed qty for subcontract item (#23257) 
* fix: incorrect calculation for consumed qty for subcontract item

* added test case
 2020-09-14 21:12:16 +05:30
Marica
b67996ec42 Merge branch 'version-12-hotfix' into quality-inspection-fields-fix 2020-09-14 12:01:26 +05:30
marination
a34a490e0c fix: Make sure Supplier/Customer is selected before fetching Items. 2020-09-14 11:11:39 +05:30
marination
815416adc5 fix: Make Reference fields mandatory in Quality Inspection 2020-09-14 11:07:26 +05:30
Marica
32179293ee Merge branch 'version-12-hotfix' into batch-source-reference 2020-09-07 19:30:36 +05:30
rohitwaghchaure
b2bf54cc33 Merge pull request #23260 from anupamvs/se-quantity-v12 
fix: SE quantity data type issue
 2020-09-04 16:07:32 +05:30
Anupam K
9260cf11b6 fix: SE quantity data type issue 2020-09-04 15:10:50 +05:30
Marica
7c963a03cb Merge branch 'version-12-hotfix' into batch-source-reference 2020-09-03 18:01:09 +05:30
marination
8781e77132 fix: Test for Over Receipt via PRs on a PO 2020-09-03 15:48:18 +05:30
Marica
203f78cf97 Merge branch 'version-12-hotfix' into batch-source-reference 2020-09-03 15:39:44 +05:30
marination
44717e3b4a fix: Item Alternative Test 2020-09-03 14:41:05 +05:30
marination
9b6326f5d4 chore: Tests for Stock Reconciliation 2020-09-02 19:21:16 +05:30
marination
6b785cf522 chore: Tests for Stock Entry 2020-09-02 15:45:02 +05:30
marination
eab2d25c6a fix: Unlink and delete batch created from stock reco on cancel 2020-08-27 20:34:51 +05:30
Rohit Waghchaure
09cb0f33b2 added test cases 2020-08-27 14:57:37 +05:30
Rohit Waghchaure
dcd80a3f48 fix: incorrect stock balance issue 2020-08-27 13:24:33 +05:30
Nabin Hait
a82d9d3182 test: Test case for GLE in subcontracted PR if FG item rate is zero 2020-08-22 20:07:19 +05:30
Nabin Hait
98fda4b8c3 fix: GLE for subcontracted PR is fg item rate is zero 2020-08-22 20:07:05 +05:30
Rohit Waghchaure
5e32ee8457 fix: not able to submit delivery note 2020-08-20 12:21:09 +05:30
Suraj Shetty
bf7adb8b38 refactor: Format and sanitise user inputs to search queries. (#23064) 
* 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-20 11:17:30 +05:30
Deepesh Garg
a979fcc25b fix: Project link not set in accounts other than profit and loss accounts (#22049) 
* fix: project link not set in accounts other than profilt and loss accounts

* fix: cannot find get_allow_cost_center_in_entry_of_bs_account

* fix: remove enable_allow_cost_center_in_entry_of_bs_account

* chore: add tests and remove test based on allow_cost_center_for_bs_accounts

* fix: travis

* fix: Test Cases

* fix: Patch to remove Property Setter

* fix: Test Cases

* fix: Remove v13 patch

* fix: Procurement Tracker test case

* fix: Proccurement tracker report test

* fix: Codacy

* fix: Remove duplicate project field

Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2020-08-12 21:06:25 +05:30
Rucha Mahabal
2a0ed798aa fix: TypeError while setting transfer_qty in Stock Entry (#22931) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-08-12 14:32:23 +05:30
Afshan
2cf4168009 fix: show or hide section or attributes depending on other attributes… (#22933) 
* fix: show or hide section or attributes depending on other attributes for better UI

* fix:depends on: batch_no for retain sample

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-08-06 19:04:35 +05:30
Marica
9afebd311f fix: Reposition description in Warehouse (#22896) 2020-08-03 20:39:41 +05:30
Marica
a9cfe0c95c fix: Misleading description in Warehouse (#22879) 2020-08-03 14:56:46 +05:30
Marica
0fee76f409 fix: Dont merge items if both exist in stock reco (#22784) 
* fix: incorrect stock after merging items

* fix: Readability fix

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2020-07-22 18:53:40 +05:30
Marica
74963e9711 fix: Serial No Rename does not affect Stock Ledger Entry (#22780) 2020-07-22 18:17:25 +05:30
Deepesh Garg
e077c0a270 fix: Randomly failing test (#22773) 
* fix(travis): Item Tax tempate template test

* fix: Update tests

* fix: Test

* fix: Do not use random customers

* fix: Remove every bit of randomness from this test
 2020-07-22 16:12:12 +05:30
Afshan
517108d10a fix: added set query for filters in MR (#22770) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-07-22 15:51:48 +05:30
Afshan
a7094641d4 style: moved parent warehouse to top section also added a section break for better look (#22772) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-07-22 15:45:37 +05:30
Marica
7e461ce860 Merge branch 'version-12-hotfix' into incorrect-qty-after-transaction-stock-reco 2020-07-20 11:34:29 +05:30
rohitwaghchaure
7709c640b5 Merge pull request #22720 from rohitwaghchaure/fixed-incorrect-currency-symbol-in-stock-balance-report 
fix: currency symbol not showing as per company currency in stock bal…
 2020-07-17 14:35:13 +05:30
Rohit Waghchaure
34a91bd7e6 fix: currency symbol not showing as per company currency in stock balance 2020-07-17 11:24:40 +05:30
rohitwaghchaure
785462b513 Update stock_reconciliation.js 2020-07-17 10:55:05 +05:30
Rohit Waghchaure
0d5f8c5050 fix: for past dated stock reco, batched item showing the current available qty instead of quantity as per posting date 2020-07-17 08:57:31 +05:30
rohitwaghchaure
0f2601a6a6 Merge pull request #22649 from rohitwaghchaure/fixed-incorrect-balance-qty-in-stock-ledger 
fix: incorrect balance qty in stock ledger report
 2020-07-15 17:20:04 +05:30
marination
71fa045ba4 fix: Added Project Field in Purchase Receipt for Stock Ledger Tagging 2020-07-15 12:54:19 +05:30
Deepesh Garg
8317ff8bb2 Merge branch 'version-12-hotfix' into fixed-incorrect-balance-qty-in-stock-ledger 2020-07-12 17:21:25 +05:30
Rohit Waghchaure
671fc7b919 fix: incorrect balance qty in stock ledger report 2020-07-10 18:11:04 +05:30
Rohit Waghchaure
335815a75d fix: incorrect qty after transaction in stock ledger entry 2020-07-10 14:23:12 +05:30