Commit Graph

2053 Commits

Author SHA1 Message Date
Sagar Vora
9baa222976
fix: specify allowed doctype in queries (#31761) 2022-08-03 11:12:30 +05:30
mergify[bot]
89f516c32b
fix: assign duplicate_items_msg outside conditional (backport #31639) (#31650)
fix: assign duplicate_items_msg outside conditional (#31639)

duplicate_items_msg was defined inside if the statement  of stock_item so when duplicate was found in non_stock_item it raised referenced before assignment

(cherry picked from commit 8e23c6ad69dee213f0252d2b231317490fab760f)

Co-authored-by: Maharshi Patel <39730881+maharshivpatel@users.noreply.github.com>
2022-07-21 13:57:03 +05:30
rohitwaghchaure
5a3999e236
Merge pull request #31424 from rohitwaghchaure/feat-inventory-dimension
feat: Inventory Dimension
2022-07-20 19:47:14 +05:30
Rohit Waghchaure
289e6cd4ce fix: change frappe.db.sql to frappe.qb 2022-07-20 16:02:13 +05:30
Rohit Waghchaure
e576f7f07e test: test cases for inventory dimension 2022-07-20 16:02:13 +05:30
Rohit Waghchaure
dbec5cff00 feat: Inventory Dimension 2022-07-20 16:02:13 +05:30
Rucha Mahabal
d8aa1c59f1
Merge branch 'develop' into hr-separation 2022-07-12 19:27:19 +05:30
Deepesh Garg
0b822dade0
Merge pull request #31566 from deepeshgarg007/ignore_account_currency
fix: Allow multi currency invoice against single party account
2022-07-11 21:14:02 +05:30
Deepesh Garg
e04e67c6bf chore: fix query 2022-07-11 19:25:18 +05:30
Deepesh Garg
3cf609fab1 chore: Ignore validation 2022-07-11 13:46:59 +05:30
Rucha Mahabal
ef02e58859 Merge branch 'develop' into hr-separation 2022-07-07 13:46:54 +05:30
Sagar Sharma
f9885746a8
Merge branch 'develop' into subcontracting 2022-07-07 09:56:23 +05:30
marination
aa043fe961 fix: Use fallback conversion factor while setting incoming rate for petty purchase
- PIs for petty items (that do not need an Item record) are allowed using Item Name field
- If a different UOM is used in this case, conversion factor stays 0 and causes an error
- Fallback to 1 in `set_incoming_rate` for buying
- Selling will need a proper item, so this change is not needed there
2022-07-05 19:43:02 +05:30
Sagar Sharma
f75d35ed60
Merge branch 'develop' into subcontracting 2022-07-05 11:25:08 +05:30
Deepesh Garg
e54ec4b9b6 chore: use get instead of . operator 2022-07-03 11:02:21 +05:30
Deepesh Garg
b4f6429e32 Merge branch 'develop' of https://github.com/frappe/erpnext into e_invoice_discounts 2022-07-02 18:42:31 +05:30
Sagar Sharma
fd162f9b14 fix: supplier warehouse in PR 2022-07-01 16:51:19 +05:30
Sagar Sharma
78ff1783b1 Merge branch 'develop' into subcontracting 2022-06-28 22:20:32 +05:30
Rucha Mahabal
6a65c8aff4 Merge branch 'develop' into hr-separation 2022-06-28 11:51:59 +05:30
Ankush Menat
dd11f26eba
fix: dont update RM items table if not required (#31408)
Currently on PO update RM item table is auto computed again and again,
if there was any transfer/consumption against that then it will be lost.

This change:
1. Disables updating RM table if no change in qty of FG was made. Since
   RM table can't possibly be different with same FG qty.
2. Blocks update completely if qty is changed and RM items are already
   transferred.
2022-06-27 15:55:08 +05:30
Deepesh Garg
f572c20009
Merge branch 'develop' into internal_trasfer_precision_loss 2022-06-21 10:45:02 +05:30
s-aga-r
f6ef3068d7 Merge branch 'develop' into subcontracting 2022-06-20 23:10:31 +05:30
s-aga-r
6d89b2fa28 refactor: backport old subcontracting code 2022-06-20 23:10:02 +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
169ff5a0dd feat: Cash and Non trade discounts in Sales Invoice 2022-06-19 21:18:12 +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
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
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
Rucha Mahabal
3fe2ef6790 chore: update import paths for HR 2022-06-15 12:43:45 +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
s-aga-r
9a68af36ec Merge branch 'develop' into subcontracting 2022-06-14 19:13:10 +05:30
Deepesh Garg
d05d15346a fix: Conversion rate validation for multi-currency invoices 2022-06-14 12:50:49 +05:30
Deepesh Garg
5b2ba087a3 Merge branch 'develop' of https://github.com/frappe/erpnext into quotation_issues 2022-06-14 10:50:47 +05:30
Conor
00ef499739
refactor: use db independent offset syntax (#31345)
* chore: use db independent offset syntax

* fix: typo

* style: reformat code to black spec

Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-06-14 10:49:07 +05:30
Deepesh Garg
118c786e63 fix: Partially Ordered status for quotation 2022-06-11 21:55:59 +05:30
Rucha Mahabal
512c82f76d chore: Update imports/paths for doctypes moved to erpnext setup module 2022-06-10 15:06:54 +05:30
Ankush Menat
65b21ee7d6 fix: internal transfer GLE validation 2022-06-08 19:26:40 +05:30
Sagar Sharma
f7a52f76d4
Merge branch 'develop' into subcontracting 2022-06-08 04:27:24 -07:00
Ankush Menat
7726271e2a fix: purchase invoice return GLe
voucher_wise_stock_value contains tuples and the condition was looking
for string, so it's never triggered.

Caused by https://github.com/frappe/erpnext/pull/24200
2022-06-07 12:08:20 +05:30
Sagar Sharma
74fae72939
Merge branch 'develop' into subcontracting 2022-06-06 10:27:25 +05:30
s-aga-r
992ba974e2 Merge branch 'develop' into subcontracting 2022-06-03 13:25:49 +05:30
Devin Slauenwhite
b061ea4cd2
chore: linter 2022-06-02 14:23:54 -04:00
Devin Slauenwhite
3a1c923e76
fix: display currencies in validation message. 2022-06-02 14:15:50 -04:00
Ankush Menat
77dcdff0db
fix: unusable SO after clearing taxes (#31215) 2022-06-01 22:01:07 +05:30
Ankush Menat
c84e11ac82
fix: re-validate warehouse after 'update items' (#31203) 2022-06-01 12:55:10 +05:30
Sagar Sharma
bcaac8f90f
Merge branch 'develop' into subcontracting 2022-05-26 15:01:23 +05:30
Deepesh Garg
ac17ecb84b
Merge branch 'develop' into party_account_currency_check 2022-05-25 16:21:06 +05:30
Sagar Sharma
213113bc00 Merge branch 'develop' into subcontracting 2022-05-20 12:13:13 +05:30
Sagar Sharma
e9b28452e4 feat: SCR return 2022-05-20 10:45:34 +05:30
Sagar Sharma
3469560105 refactor!: Accounts Controller 2022-05-20 10:45:33 +05:30