schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
49,404 Commits 322 Branches 1,581 Tags
291f0a580be176a4c87c03e54372dd7a7cca9cb1
Commit Graph

255 Commits

Author SHA1 Message Date
Dany Robert
291f0a580b fix: invalid gp calculation 
(cherry picked from commit c79851239c)
 2024-09-17 06:33:19 +00:00
barredterra
4914481105 fix: translatability of boldened text 
(cherry picked from commit af0ae930ca)

# Conflicts:
#	erpnext/controllers/accounts_controller.py
 2024-08-17 00:21:05 +00:00
Smit Vora
91a5c562d8 Merge pull request #42489 from frappe/mergify/bp/version-15-hotfix/pr-42050 
fix: Update Rate as per Valuation Rate for Internal Transfers only if Setting is Enabled (backport #42050)
 2024-08-13 11:25:09 +05:30
mergify[bot]
97cc3082e1 fix: inter transfer delivery note issue with batch (backport #42552) (#42556) 
fix: inter transfer delivery note issue with batch (#42552)

(cherry picked from commit f620ef20ae)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-08-01 13:22:33 +05:30
Ninad Parikh
6e833cce6a fix: Update Rate as per Valuation Rate for Internal Transfers only if Setting is Enabled (#42050) 
* fix: update rate for internal transfers only if settings enabled

* fix: better naming

* fix: create field for storing incoming rate in purchase doctypes

* fix: use qty instead of qty_in_stock_uom

* fix: add description, refactor for readablility

* test: test case to validate internal transfers at arm's length price

* fix: minor fix

* fix: deletion of code not required

---------

Co-authored-by: Smit Vora <smitvora203@gmail.com>
(cherry picked from commit 723ac0ffc4)
 2024-07-26 12:58:12 +00:00
mergify[bot]
cf2651dd85 fix: not able to cancel the inter transfer DN (backport #42333) (#42340) 
fix: not able to cancel the inter transfer DN (#42333)

(cherry picked from commit 6d42cd0f4c)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-07-15 16:52:28 +05:30
ljain112
ab987e9a86 fix: removed max discount validation for sales return 
(cherry picked from commit db807d433b)
 2024-07-10 07:02:02 +00:00
Rohit Waghchaure
e9c6c5a8eb fix: zero division error 
(cherry picked from commit f9e230e758)
 2024-04-11 12:25:39 +00:00
Akhil Narang
960ef14b7a refactor(treewide): formatting and ruff fixes, + manually enabled F401 
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
 2024-04-10 14:15:58 +05:30
Deepesh Garg
5117494a52 fix: Recalculate sales commission on item update 
(cherry picked from commit f76da50b7e)
 2024-04-01 15:09:05 +00:00
Rohit Waghchaure
d2a6509950 fix: button to select serial / batch bundle in the subcontracting receipt 
(cherry picked from commit d73b1f3e6a)

# Conflicts:
#	erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
#	erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json
 2024-03-30 05:54:14 +00:00
mergify[bot]
61d59b392a fix: serial and batch for internal transfer (backport #40467) (#40477) 
fix: serial and batch for internal transfer (#40467)

* fix: serial and batch for internal transfer

* chore: fix test cases

(cherry picked from commit 59222813af)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-03-15 18:19:56 +05:30
mergify[bot]
1860399ccb fix: use serial batch fields for packed items (backport #40140) (#40142) 
fix: use serial batch fields for packed items (#40140)

(cherry picked from commit bc9c480246)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-27 07:57:37 +05:30
Gursheen Anand
3b96aaeead fix: skip max discount validation for rate adjustment 
(cherry picked from commit 5a3b133d65)
 2024-02-23 07:28:37 +00:00
Rohit Waghchaure
1b2831bdfe perf: timeout for auto material request through reorder level 
(cherry picked from commit 951023f434)
 2024-02-05 06:10:56 +00:00
mergify[bot]
f3882a854f fix: don't set rate for non-stock item in Internal Transfer (backport #39140) (#39169) 
* fix: don't set rate for non-stock item in Internal Transfer

(cherry picked from commit e1b0fffd0c)

* test: internal transfer for non-stock item

(cherry picked from commit 57b6a98703)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-01-06 11:03:24 +05:30
mergify[bot]
eabb956aca fix: reposting not fixing valuation rate for sales return using movin… (backport #38895) (backport #38897) (#38901) 
fix: reposting not fixing valuation rate for sales return using movin… (backport #38895) (#38897)

* fix: reposting not fixing valuation rate for sales return using movin… (#38895)

fix: reposting not fixing valuation rate for sales return using moving average method
(cherry picked from commit 3a668bbe96)

# Conflicts:
#	erpnext/stock/stock_ledger.py

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit 07175367d8)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
 2023-12-21 15:44:50 +05:30
mergify[bot]
d65be69c4c fix: incoming rate for sales return with Moving Average valuation method (backport #38849) (backport #38863) (#38866) 
fix: incoming rate for sales return with Moving Average valuation method (backport #38849) (#38863)

* fix: incoming rate for sales return with Moving Average valuation method (#38849)

(cherry picked from commit 7fdac62393)

# Conflicts:
#	erpnext/stock/doctype/delivery_note/test_delivery_note.py

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit 4057682c87)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
 2023-12-19 19:13:08 +05:30
mergify[bot]
8990c48e7b fix: serial and batch bundle return not working (backport #38754) (#38806) 
fix: serial and batch bundle return not working (#38754)

* fix: serial and batch bundle return not working

* test: added test case for delivery note return against denormalized serial no

(cherry picked from commit 0743289925)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-17 18:02:31 +05:30
mergify[bot]
c797c533ed fix: validation error has not throw for the batch (backport #38494) (#38502) 
fix: validation error has not throw for the batch (#38494)

* fix: validation error has not throw for the batch

* chore: fix test cases

(cherry picked from commit 5e9016ffab)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-01 21:46:35 +05:30
Gursheen Anand
d076aca998 chore: linting issues 
(cherry picked from commit 1657337887)
 2023-11-24 04:30:39 +00:00
Gursheen Anand
5c12872f70 fix: has_product_bundle util to only check for enabled bundles 
(cherry picked from commit 3543f86c63)
 2023-11-24 04:30:38 +00:00
Ankush Menat
f4d74990fe fix: E-commerce permissions 2023-10-17 22:28:04 +05:30
Ankush Menat
7b9cedebf6 fix: Ignore addr permission in internal code 2023-10-17 19:00:52 +05:30
mergify[bot]
d2aa4d5d6b fix: validation message for valuation rate (backport #37301) (#37351) 
fix: validation message for valuation rate (#37301)

(cherry picked from commit 643bb0511c)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-10-05 18:13:23 +05:30
rohitwaghchaure
dd4769ecf1 feat: allow to edit Stock Quantity in the Sales and Purchase Transactions (#36600) 
feat: allow to edit Stock Quantity in the Sales and Purchase transactions
 2023-09-20 18:09:03 +05:30
mergify[bot]
35f72a17db Allow to make return against sales invoice which has closed sales order. (#36676) 
fix: Allow to make return against sales invoice which has closed sales order

fix: Allow to make return against sales invoice which has closed sales order
(cherry picked from commit 0f98cc85e9)

Co-authored-by: Gourav Saini <63018500+gouravsaini021@users.noreply.github.com>
 2023-08-26 19:29:33 +05:30
Nabin Hait
5a0aacc0b6 fix: get party details 2023-06-06 15:39:22 +05:30
Rohit Waghchaure
d3ceb07936 fix: travis 2023-06-02 17:14:17 +05:30
Rohit Waghchaure
86da306cca feat: added negative inventory validation and restrict to make backdated entry for serial nos 2023-06-02 17:14:15 +05:30
Rohit Waghchaure
674bd3e2e5 feat: serial and batch bundle for Packing Items 2023-06-02 17:14:15 +05:30
Rohit Waghchaure
e6143abb8a refactor: added new file serial batch bundle 2023-06-02 17:14:14 +05:30
Rohit Waghchaure
6c9b212dd1 fix: removed sales and purchase fields from serial nos 2023-06-02 17:14:14 +05:30
Indrajith.vs
0c8276ec82 fix: sales person allocated amount calculation error nonetype and float (#35293) 
fix: sales person allocated amount calculation error nontype and float
 2023-05-14 11:47:46 +05:30
Deepesh Garg
9a8f8e8b7d Revert "fix: Default sales team not getting set" (#34376) 
Revert "fix: Default sales team not getting set (#34284)"

This reverts commit 7d0199d743.
 2023-03-09 15:36:52 +05:30
Deepesh Garg
10632d75b0 fix: Do not calculate commission post submit (#34267) 
* fix: Do not calculate commision post submit

* chore: Update condition to match server side logic

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>

---------

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2023-03-07 11:44:09 +05:30
Deepesh Garg
7d0199d743 fix: Default sales team not getting set (#34284) 2023-03-07 11:41:26 +05:30
Rohit Waghchaure
02566a02a8 fix: incorrect actual qty for the packed item 2023-01-20 22:38:56 +05:30
s-aga-r
c716dcc01e fix: consider child nodes while getting bin details 2022-12-29 14:01:42 +05:30
Ankush Menat
915e0347b0 chore!: remove activity log feeds (#33294) 
- This contains little to no information and practically no one uses this.
- Also causes a lot of problem by adding way too many feeds in activity
  log to the point where activity page doesn't even load.
 2022-12-12 15:14:30 +05:30
Deepesh Garg
ef9d126254 fix: Allow item rate udpates for non-stock invoices 2022-12-05 10:17:19 +05:30
Deepesh Garg
8287fb5104 Merge pull request #33143 from deepeshgarg007/auto_repeat_dates 
fix: Auto repeat date validations
 2022-11-29 09:28:19 +05:30
Deepesh Garg
fa15221455 fix: Auto repeat date validations 2022-11-28 19:22:35 +05:30
Deepesh Garg
104fdcb9f9 fix: Dispatch address display 2022-11-24 16:41:40 +05:30
Deepesh Garg
083309c056 fix: Incoming rate precision fixes for intra company transfer 2022-09-19 15:06:06 +05:30
Rohit Waghchaure
237299948a fix: fetch from parent not working for custom field 2022-09-03 17:27:00 +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 8e23c6ad69)

Co-authored-by: Maharshi Patel <39730881+maharshivpatel@users.noreply.github.com>
 2022-07-21 13:57:03 +05:30
Ankush Menat
ee0a277540 fix: prevent bypassing forced valuation rate 
if you edit "margin_rate_or_amount" after saving DN then based on
selected margin the rate gets updated which isn't valuation rate.
 2022-05-12 19:01:26 +05:30
Nabin Hait
993c6c0de9 feat: Ignore permlevel for specific fields 2022-04-12 12:24:47 +05:30
Ankush Menat
494bd9ef78 style: format code with black 2022-03-28 18:52:46 +05:30