nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-22 10:49:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,270 Commits 605 Branches 1,802 Tags
55d67a0d09fdf5e1a1411c7e303990d3c5a9fdf6
Commit Graph

42270 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marica
55d67a0d09 Merge pull request #31420 from HarryPaulo/translate-status-filter-orders 
fix: translation for filter status on report
 2022-06-22 11:45:59 +05:30
rohitwaghchaure
2ed06d7ceb Merge pull request #31248 from rohitwaghchaure/fixed-transferred-materials-are-not-consumed 
fix: transferred batches are not fetched while making Manufacture stock entry
 2022-06-22 11:37:15 +05:30
hrzzz
8b1ff96e30 fix: translation for filter status on report 2022-06-21 15:10:19 -03:00
rohitwaghchaure
186224a12a Merge branch 'develop' into fixed-transferred-materials-are-not-consumed 2022-06-21 22:45:05 +05:30
Vladislav
ce1b4e40a1 fix: update ru translate (#31404) 
* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

fix logic

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv
 2022-06-21 19:25:05 +05:30
Ankush Menat
e866ec6e28 Merge pull request #31412 from s-aga-r/fix/bom/default 
fix: set default_bom for item
 2022-06-21 16:42:38 +05:30
s-aga-r
dc2830da4d fix: set default_bom for item 2022-06-21 15:13:01 +05:30
Deepesh Garg
b16ab818c5 Merge pull request #31264 from ankush/internal_trasfer_precision_loss 
fix: internal transfer GLE validation
 2022-06-21 14:31:18 +05:30
Sagar Sharma
912d26361d Merge branch 'develop' into fixed-transferred-materials-are-not-consumed 2022-06-21 13:23:37 +05:30
Deepesh Garg
f572c20009 Merge branch 'develop' into internal_trasfer_precision_loss 2022-06-21 10:45:02 +05:30
Deepesh Garg
e0e2616054 Merge pull request #31350 from deepeshgarg007/sales_exchange_rate_validation 
fix: Conversion rate validation for multi-currency invoices
 2022-06-21 09:09:38 +05:30
Deepesh Garg
46e6c2cd0f Merge branch 'develop' of https://github.com/frappe/erpnext into sales_exchange_rate_validation 2022-06-20 22:00:49 +05:30
Deepesh Garg
8f37393044 test: Add test case 2022-06-20 22:00:32 +05:30
Deepesh Garg
9aea017990 Merge pull request #31136 from ruthra-kumar/refactor_payment_reconciliation_tool 
refactor: Payment Reconciliation tool will use Payment Ledger
 2022-06-17 21:40:47 +05:30
Conor
ea28ed1bb3 refactor: if() to CASE WHEN (#31360) 
* refactor: if() to CASE WHEN

* fix: remove duplicate order by

* fix: remove extraneous table

* style: reformat to black spec

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-06-17 21:17:48 +05:30
Deepesh Garg
4a90cd6d54 Merge branch 'develop' into refactor_payment_reconciliation_tool 2022-06-17 21:10:48 +05:30
Deepesh Garg
a0cab761b8 Merge pull request #31396 from deepeshgarg007/quotation_lost_update 
fix: Quotation lost update
 2022-06-17 21:09:03 +05:30
Deepesh Garg
e457288dba chore: fix condition 2022-06-17 18:56:53 +05:30
Deepesh Garg
02f9441e1a fix: Quotation lost update 2022-06-17 18:54:42 +05:30
ruthra kumar
3a238b4daa docs: specification of payment ledger 2022-06-17 17:57:07 +05:30
ruthra kumar
7312f22f35 refactor: update voucher outstanding from payment ledger 
Outstanding amount is updated from payment ledger, only for
receivable/payable accounts. For remaining account types, update happens
from GL Entry.
 2022-06-17 17:57:07 +05:30
ruthra kumar
524c175cf0 refactor: delink gl entry from reconciliation 2022-06-17 17:57:07 +05:30
ruthra kumar
ae8aa8f3e7 refactor: 'get outstanding invoices' popup in payment entry 
Payment entry has option to select outstanding invoices using a popup
form. This change refactors the pop to use payment ledger to fetch +ve
outstanding invoices.
 2022-06-17 17:57:07 +05:30
ruthra kumar
8c87674c62 refactor: outstanding_invoice function and helper class 
outstanding invoice function has been refactored to use payment ledger
 2022-06-17 17:57:07 +05:30
ruthra kumar
9cdc388c97 test: payment reconciliation tool 
unit test cases for partial reconciliation, return invoice against
invoice, invoice against journals and journal against journal have
been added
 2022-06-17 17:57:07 +05:30
ruthra kumar
65f47bca31 refactor: payment reconciliation tool 
PR uses payment ledger for outstanding invoice and unreconcilied
cr/dr notes.
 2022-06-17 17:57:07 +05:30
ruthra kumar
7b383880c6 feat: helper class for quering Payment Ledger 2022-06-17 17:57:07 +05:30
ruthra kumar
05467ffce2 test: use fixture for payment entry test cases (#31390) 
refactor: use fixture for payment entry test cases
 2022-06-17 17:23:29 +05:30
Conor
74a782d81d refactor: DB independent quoting and truthy/falsy values (#31358) 
* refactor: DB independent quoting and truthy/falsy values

* style: reformat to black spec

* fix: ifnull -> coalesce

* fix: coalesce -> Coalesce

* fix: revert pypika comparison

* refactor: convert queries to QB

* fix: incorrect value types for query

`=` query makes no sense with list of values

* fix: remove warehouse docstatus condition

* fix: keep using base rate as rate

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-06-17 17:01:27 +05:30
Marica
d6078aa911 fix: Respect system precision for user facing balance qty values (#30837) 
* fix: Respect system precision for user facing balance qty values

- `get_precision` -> `set_precision`
- Use system wide currency precision for `stock_value`
- Round of qty defiiciency as per user defined precision (system flt precision), so that it is WYSIWYG for users

* fix: Consider system precision when validating future negative qty

* test: Immediate Negative Qty precision test

- Test for Immediate Negative Qty precision
- Stock Entry Negative Qty message: Format available qty in system precision
- Pass `stock_uom` as confugrable option in `make_item`

* test: Future Negative Qty validation with precision

* fix: Use `get_field_precision` for currency precision as it used to

- `get_field_precision` defaults to number format for precision (maintain old behaviour)
- Don't pass `currency` to `get_field_precision` as its not used anymore
 2022-06-17 15:13:13 +05:30
Ankush Menat
74007c8e91 fix(UX): hide irrelevant UOM fields (#31392) 
fix(UX): hide UOM-related fields if they are inconsequential
 2022-06-17 15:10:21 +05:30
rohitwaghchaure
2ec133df6d Merge branch 'develop' into fixed-transferred-materials-are-not-consumed 2022-06-17 15:02:07 +05:30
Ankush Menat
10583eb3ce fix: UOM handling for transaction without item (#31389) 
If invoice is made without item code then UOM, Stock UOM and
conversion_factor all need to be manually added, this is confusing and
leads missing them out leads to errors.

Simplest solution:

- if either UOM exists then set both to same uom conversion factor to
- also set conversion factor based on UOM conversions
 2022-06-17 12:13:27 +05:30
Sagar Vora
1a3997a566 fix: transaction date gets unset in material request (#31327) 
* fix: set date correctly in material request

* fix: use only `transaction_date` in `get_item_details`
 2022-06-16 22:33:47 +05:30
Ankush Menat
6f2086d770 test: verify that all patches exist in patches.txt (#31371) 
* chore: delete orphaned patches

* test: orphan/missing entries in patches.txt


[skip ci]
 2022-06-16 22:15:06 +05:30
Jingxuan He
b4a93da9f3 chore: Fix a potential variable misuse bug (#31372) 
* Fix a potential variable misuse bug

* chore: Separate check (separate line) for empty table in Pricing Rule

* chore: Code readability & check for field in row (now row itself)

Co-authored-by: marination <maricadsouza221197@gmail.com>
 2022-06-16 12:16:59 +05:30
Ankush Menat
86919d2a6d test: silent test failure in stock assertions (#31377) 
If actual values are not present then test is silently passing, # of
actual values should be at least equal to expected values.
 2022-06-15 21:19:09 +05:30
Ankush Menat
5c6f22f275 refactor: simpler batching for GLE reposting (#31374) 
* refactor: simpler batching for GLE reposting

* test: add "actual" test for chunked GLE reposting
 2022-06-15 19:30:26 +05:30
Marica
d9c6b7218a chore: Sponsor credit for BOM Update Tool perf 2022-06-15 18:57:39 +05:30
Rushabh Mehta
c0f9b34ede fix(minor): move variants to separate tab (#31354) 
* fix(minor): move variants to separate tab

* fix(minor): variants tab

* fix(minor): add counts

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-06-15 16:08:05 +05:30
Ankush Menat
276267d5a6 fix: remove agriculture module from patch (#31369) 2022-06-15 15:26:05 +05:30
Marica
c83b4043b8 Merge pull request #31353 from marination/so-to-wo-bom 
fix: Pick Template BOM if variant BOM absent in WO popup from SO
 2022-06-15 14:37:15 +05:30
Ankush Menat
94ad66e55b chore: revert naming to default (#31364) 2022-06-15 13:35:42 +05:30
Deepesh Garg
be14a7e657 Merge pull request #31365 from ruthra-kumar/add_gl_migration_to_patch 
chore: add gl to payment ledger migarion to patches
 2022-06-15 13:20:10 +05:30
ruthra kumar
538faf3639 chore: add gl to payment ledger migarion to patches 2022-06-15 13:17:06 +05:30
Marica
fafdaff4d4 Merge branch 'develop' into so-to-wo-bom 2022-06-15 12:58:13 +05:30
Conor
b8f728a40a refactor: use CURRENT_DATE instead of CURDATE() (#31356) 
* refactor: use CURRENT_DATE instead of CURDATE()

* style: reformat to black spec

* refactor: use QB for auto_close queries

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-06-15 12:07:33 +05:30
Nihantra C. Patel
37e9622426 fix: Spelling mistake in quotation depend on (#31362) 
Update quotation.json
 2022-06-15 12:02:57 +05:30
Conor
2a9105f26f refactor: DB independent capitalization of test cases (#31359) 2022-06-15 11:24:24 +05:30
rohitwaghchaure
a4c2c3e02f Merge branch 'develop' into fixed-transferred-materials-are-not-consumed 2022-06-15 09:41:01 +05:30