schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
40,656 Commits 322 Branches 1,581 Tags
051e5cd74118dd4102dba32250b0cac34024ecea
Commit Graph

564 Commits

Author SHA1 Message Date
mergify[bot]
051e5cd741 fix: UOM handling for transaction without item (backport #31389) (#31391) 
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

(cherry picked from commit 10583eb3ce)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-06-17 15:11:28 +05:30
Devin Slauenwhite
f4a4dacb22 chore: linter 
(cherry picked from commit b061ea4cd2)
 2022-06-06 03:37:41 +00:00
Devin Slauenwhite
ef22337a9b fix: display currencies in validation message. 
(cherry picked from commit 3a1c923e76)
 2022-06-06 03:37:40 +00:00
mergify[bot]
3a718c7d5f fix: re-validate warehouse after 'update items' (backport #31203) (#31206) 
fix: re-validate warehouse after 'update items' (#31203)

(cherry picked from commit c84e11ac82)

Co-authored-by: Ankush Menat <me@ankush.dev>
 2022-06-01 15:24:55 +05:30
Deepesh Garg
f724f6d1bb chore: Resolve conflicts 2022-05-25 19:04:20 +05:30
Deepesh Garg
8f969fbd66 test: Update test cases for currency change validation 
(cherry picked from commit 60915e874d)

# Conflicts:
#	erpnext/accounts/doctype/period_closing_voucher/test_period_closing_voucher.py
#	erpnext/healthcare/doctype/patient_appointment/patient_appointment.py
#	erpnext/healthcare/doctype/therapy_plan/therapy_plan.py
#	erpnext/non_profit/doctype/membership/membership.py
 2022-05-25 11:33:42 +00:00
Deepesh Garg
228f10bf30 fix: Account currency validation for first transaction 
(cherry picked from commit 80c85dd17c)

# Conflicts:
#	erpnext/controllers/accounts_controller.py
 2022-05-25 11:33:38 +00:00
mergify[bot]
c3417e4103 fix: discount ledger entry in case of multicurrency invoice (#31047) 2022-05-17 12:22:08 +05:30
mergify[bot]
d5eb9fb3fd fix: disable pricing rules for internal transfers (backport #31034) (#31036) 
fix: disable pricing rules for internal transfers (#31034)

* fix: disable pricing rules for internal transfers

* fix: only apply validation on internal transfers

* fix: internal_party_field undefined

(cherry picked from commit 3714e36b44)

Co-authored-by: Ankush Menat <me@ankush.dev>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2022-05-16 18:34:39 +05:30
marination
56478752e4 fix: Block 0 Qty via Update Items to be consistent with form validation 
(cherry picked from commit 0c9154389b)
 2022-05-11 07:12:29 +00:00
Deepesh Garg
a167f9e17f test: Update customer in Sales Invoice 
(cherry picked from commit c38be53ce8)
 2022-04-14 09:40:53 +00:00
Deepesh Garg
9c5f8415bf fix: Exchange gain and loss on advance jv allocation 
(cherry picked from commit 31883b699d)
 2022-04-14 09:40:53 +00:00
Deepesh Garg
f6c9f052d2 fix: Deferred Revenue/Expense Account validation 
(cherry picked from commit 9bf5f76ac8)
 2022-04-11 11:33:33 +00:00
Saqib Ansari
8416dc713c fix: unexpected keyword argument 'pluck' 2022-03-31 16:32:01 +05:30
Saqib Ansari
a51b32b7e0 fix: merge conflicts 2022-03-31 14:19:53 +05:30
Saqib Ansari
c36b5d9ab8 perf: skip warehouse validation for non-stock items 
(cherry picked from commit 199a6da960)

# Conflicts:
#	erpnext/controllers/accounts_controller.py
 2022-03-31 08:46:16 +00:00
Saqib Ansari
ad91d57a41 perf: skip warehouse validation for non-stock items 
(cherry picked from commit 6528218ac3)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
 2022-03-31 08:46:15 +00:00
Ankush Menat
c07713b860 style: bulk format code with black 
v13 port because otherwise backports will result in conflicts always
 2022-03-29 17:29:34 +05:30
Deepesh Garg
935d2e3d64 fix: Validate income/expense account in sales and purchase invoice 
(cherry picked from commit 06936cf1c0)
 2022-03-17 13:03:20 +00:00
Deepesh Garg
da1713ad00 fix: Remove unintended changes 
(cherry picked from commit a61790c00f)
 2022-02-23 05:52:53 +00:00
Deepesh Garg
e82f55ce9e fix: Validate party account with company 
(cherry picked from commit 5a2b571aa9)
 2022-02-23 05:52:52 +00:00
Ankush Menat
90ebe6f266 fix: avoid creating bins without item-wh 
Co-Authored-By:  Shadrak Gurupnor <30501401+shadrak98@users.noreply.github.com>
Co-Authored-By: Saurabh <saurabh6790@gmail.com>
(cherry picked from commit c36bd7e1a6)
 2022-02-17 20:17:13 +05:30
Saqib Ansari
23a5b3df18 fix: ignore pricing rule in all transactions 
(cherry picked from commit ab36b27a94)
 2022-02-09 08:02:56 +00:00
Saqib Ansari
fc67f02ffc test: item price on remove pricing rule 
(cherry picked from commit b8c41e3030)

# Conflicts:
#	erpnext/accounts/doctype/pricing_rule/test_pricing_rule.py
 2022-02-09 08:02:55 +00:00
ruthra kumar
e5112e16a8 fix: typeerror on invoice creation from SO/PO 
(cherry picked from commit 9bd56b0f79)
 2022-02-08 09:57:47 +00:00
Deepesh Garg
a4e897d30b fix: Handle frozen books while handling 
(cherry picked from commit 30a647ff80)
 2022-01-15 13:26:20 +00:00
Saqib Ansari
ecf341d1b1 fix: cannot save debit note with zero quantity 
(cherry picked from commit 2be5104848)
 2022-01-07 13:06:01 +00:00
mergify[bot]
2838dc537e fix: update idx after updating items in so/po (#29134) (#29136) 
(cherry picked from commit 733c9defdf)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-01-04 19:05:38 +05:30
Pruthvi Patel
84f3f34821 Update erpnext/controllers/accounts_controller.py 
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
(cherry picked from commit 16a90d3e60)
 2022-01-03 12:30:23 +00:00
Pruthvi Patel
e648a2ccde fix: consider Discounted status 
(cherry picked from commit 0799f378b4)
 2022-01-03 12:30:23 +00:00
Pruthvi Patel
1efce21ba4 refactor: update_invoice_status with query builder 
(cherry picked from commit 6c96ed4e11)
 2022-01-03 12:30:22 +00:00
Deepesh Garg
b00f6676f1 fix: Start date validation for deferred invoices 
(cherry picked from commit 7ad149f9fe)
 2021-12-28 06:36:26 +00:00
mergify[bot]
99dfa91f81 feat: Grant commission on certain items only (#28645) 
Co-authored-by: Sagar Vora <sagar@resilient.tech>
(cherry picked from commit e10ab1626c)
 2021-12-03 15:17:45 +05:30
Deepesh Garg
03449a09ce fix: Incorrect indentation 
(cherry picked from commit 7f06c8ca57)
 2021-11-26 08:59:30 +00:00
Deepesh Garg
125ce5dd6d fix: Add tests 
(cherry picked from commit f07f010962)
 2021-11-26 08:59:30 +00:00
Deepesh Garg
31f95bd5d1 fix(refactor): Advance tds allocation to purchase invoice 
(cherry picked from commit 5ba3b28d69)
 2021-11-26 08:59:30 +00:00
Deepesh Garg
e2956922dc fix: GL Entries on advance TDS allocation 
(cherry picked from commit 25d208aa8a)
 2021-11-26 08:59:29 +00:00
mergify[bot]
b9218b3c60 fix: over billing validation (#28573) 2021-11-26 12:46:49 +05:30
Ankush Menat
fbfaf75b66 chore: remove __future__ py2 compatibility imports 2021-11-25 17:42:24 +05:30
Deepesh Garg
a9452f1277 fix: Default party account getting overriden in invoices 
(cherry picked from commit 88648570d7)
 2021-11-12 07:34:40 +00:00
Rohit Waghchaure
f88c24155c fix: COGS account in purchase receipt 
(cherry picked from commit 2a14f255cf)

# Conflicts:
#	erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
 2021-11-01 07:25:46 +00:00
Deepesh Garg
a60ecb95b0 fix: Ignore PO on So cancel 
(cherry picked from commit 051aaa708d)
 2021-10-29 06:28:28 +00:00
GangaManoj
ed58f206fa fix: Remove unused imports 
(cherry picked from commit d24cfff388)
 2021-10-29 06:28:27 +00:00
GangaManoj
d47007adb2 fix: Remove print statements 
(cherry picked from commit 8844fdbf23)
 2021-10-29 06:28:26 +00:00
GangaManoj
7c42b8b702 fix: Unlink PO on cancelling SO 
(cherry picked from commit e77534fe13)
 2021-10-29 06:28:25 +00:00
GangaManoj
2fb18afea0 fix: Unlink PO on cancelling SO 
(cherry picked from commit 8396f24e70)
 2021-10-29 06:28:24 +00:00
mergify[bot]
fb742476f8 fix: Payment Terms validation precision (#28104) 
(cherry picked from commit 9c1705205f)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
 2021-10-27 13:26:57 +05:30
mergify[bot]
019c5a338d fix(ux): overbiling message in SO->SI, PO->PI (bp #28088) 
(cherry picked from commit 6ec047cba9)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-10-27 11:08:23 +05:30
mergify[bot]
34e92ab229 fix: incorrect status being set in Invoices (backport #28019) (#28031) 
* fix: incorrect status being set in Invoices (#28019)

Co-authored-by: Pruthvi Patel <pruthvipatel145@gmail.com>
(cherry picked from commit 8d9d0987fe)

# Conflicts:
#	erpnext/patches.txt

* fix: merge conflict

Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2021-10-20 19:31:47 +05:30
Saqib Ansari
2108bf9f73 fix: cost center in exchange gain loss gl entry 
(cherry picked from commit 78ad50efc2)
 2021-09-27 07:36:14 +00:00