schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
43,482 Commits 322 Branches 1,581 Tags
14235f24b2905fc026f3a42e6e17e6e60dc253e2
Commit Graph

642 Commits

Author SHA1 Message Date
ruthra kumar
14235f24b2 fix: update advace paid in SO/PO in account currency 
(cherry picked from commit bf76b85dfd)
 2022-11-22 08:15:56 +00:00
Daizy Modi
34ca17ab11 perf: use get_cached_value instead of db.get_value in controllers (#32776) 
(cherry picked from commit 4efc947f14)
 2022-11-07 03:52:39 +00:00
Deepesh Garg
6838e5ea3b fix: Disable tax included prices for internal transfers (#32794) 
* fix: Disable tax-included prices for internal transfers

(cherry picked from commit 8d30ebb12b)
 2022-11-05 15:22:07 +00:00
Deepesh Garg
b7763d953a fix: Auto advance allocation against partial invoices 
(cherry picked from commit 181df2fe63)
 2022-11-05 10:58:42 +00:00
ruthra kumar
a561432908 fix: update advance paid in SO/PO from Payment Ledger 
(cherry picked from commit 4487065b67)
 2022-11-02 10:59:45 +00:00
anandbaburajan
f5f13c4611 fix: calculate depreciation properly on asset sale entry and scrap entry 
(cherry picked from commit ff5cad1cd6)

# Conflicts:
#	erpnext/assets/doctype/asset/depreciation.py
 2022-09-28 08:59:41 +00:00
Rohit Waghchaure
436b7e3b70 fix: suggestion threshold label and rule was not working for other items with min and max amount 
(cherry picked from commit f5bd3fa952)
 2022-09-17 06:42:22 +00:00
Nabin Hait
cd613c6033 fix: merge conflict 2022-09-13 16:20:42 +05:30
ruthra kumar
ccd0449006 fix: delete linked payment ledger entries no source doc deletion 
(cherry picked from commit 70313df531)
 2022-09-11 06:37:22 +00:00
Rohit Waghchaure
4bac0daf9b fix: internal transfer flow 2022-09-07 14:29:15 +05:30
Deepesh Garg
3afb625ff8 fix: Test cases 
(cherry picked from commit ae3dce0cbd)
 2022-08-23 04:49:57 +00:00
Deepesh Garg
b6d2de2cc1 fix: Cash and non trade discount calculation 
(cherry picked from commit 3b15966cc9)
 2022-08-23 04:49:57 +00:00
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
Sagar Sharma
78ff1783b1 Merge branch 'develop' into subcontracting 2022-06-28 22:20:32 +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
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
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
Deepesh Garg
d05d15346a fix: Conversion rate validation for multi-currency invoices 2022-06-14 12:50:49 +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
3469560105 refactor!: Accounts Controller 2022-05-20 10:45:33 +05:30
Sagar Sharma
409df263e8 refactor!: change "is_subcontracted" field type from "Select" to "Check" 2022-05-20 10:45:33 +05:30
Saqib Ansari
f915a9cef7 fix: discount ledger entry in case of multicurrency invoice (#31024) 2022-05-17 11:22:01 +05:30
Ankush Menat
3714e36b44 fix: disable pricing rules for internal transfers (#31034) 
* fix: disable pricing rules for internal transfers

* fix: only apply validation on internal transfers

Co-authored-by: Marica <maricadsouza221197@gmail.com>

* fix: internal_party_field undefined

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2022-05-16 18:09:14 +05:30
Deepesh Garg
33d9767382 Merge branch 'develop' of https://github.com/frappe/erpnext into party_account_currency_check 2022-05-12 16:40:29 +05:30
marination
0c9154389b fix: Block 0 Qty via Update Items to be consistent with form validation 2022-05-10 18:09:07 +05:30
rahib-hassan
f3fa6ac4c2 fix: account setting seperation gl discount account creation 2022-04-20 16:01:12 +05:30
Ankush Menat
0d64349142 Merge branch 'develop' into separate-discount-account 2022-04-14 17:29:28 +05:30
rahib-hassan
01fde15bd5 fix: dependent codes updated 2022-04-14 15:48:55 +05:30
Deepesh Garg
e2fa9f708e Merge pull request #30710 from deepeshgarg007/advance_jv_allocation 
fix: Exchange gain and loss on advance Journal Entry allocation
 2022-04-14 15:10:04 +05:30
Deepesh Garg
c38be53ce8 test: Update customer in Sales Invoice 2022-04-14 13:26:47 +05:30
Deepesh Garg
31883b699d fix: Exchange gain and loss on advance jv allocation 2022-04-13 20:52:25 +05:30
Deepesh Garg
9bf5f76ac8 fix: Deferred Revenue/Expense Account validation 2022-04-06 17:33:46 +05:30
Sagar Sharma
d074c93ac7 refactor!: change "is_subcontracted" field type from "Select" to "Check" 2022-04-01 13:22:44 +05:30
Saqib Ansari
199a6da960 perf: skip warehouse validation for non-stock items 2022-03-31 11:41:52 +05:30
Saqib Ansari
6528218ac3 perf: skip warehouse validation for non-stock items 2022-03-29 18:43:33 +05:30
Ankush Menat
494bd9ef78 style: format code with black 2022-03-28 18:52:46 +05:30
Deepesh Garg
06936cf1c0 fix: Validate income/expense account in sales and purchase invoice 2022-03-16 09:02:04 +05:30