Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
47,425 Commits 3 Branches 0 Tags
Commit Graph

2445 Commits

Author SHA1 Message Date
mergify[bot]
4057682c87
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 7fdac62393ee1e96969cca38a4ce0c07993dce7e)

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

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-19 18:29:56 +05:30
mergify[bot]
4aa960b744
fix: item variant with manufacturer (backport #38845) (#38847) 
* fix: item variant with manufacturer (#38845)

(cherry picked from commit e0c8ff10daeed0829266aea9142805f68ceedb2b)

* chore: fix test case

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-19 14:59:33 +05:30
mergify[bot]
32a608f948
fix: not able to make inter-company po from so (backport #38826) (#38828) 
fix: not able to make inter-company po from so (#38826)

(cherry picked from commit 23042dfc3c0d02374c5710ed679731b1910f9b9a)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-18 18:13:47 +05:30
rohitwaghchaure
0743289925
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
 2023-12-17 12:42:07 +05:30
Deepesh Garg
863116f1cd
Merge pull request #37232 from GursheenK/make-against-field-dynamic 
fix: make GL and JV against fields dynamic links
 2023-12-16 22:27:50 +05:30
Deepesh Garg
2588970d55 fix: Init internal child table values 2023-12-12 15:18:54 +05:30
rohitwaghchaure
89326bd657
fix: auto delete draft serial and batch bundle (#38637) 2023-12-10 11:05:58 +05:30
barredterra
eb9ee3f79b refactor: simplify conditional logic 
Command: `sourcery review --fix --enable de-morgan .`
 2023-12-05 11:22:55 +01:00
s-aga-r
a008f5f611
Merge pull request #38493 from s-aga-r/FIX-6325 
fix: don't update previous doc on rate change
 2023-12-03 10:08:44 +05:30
Sagar Vora
b6a7549407
fix: use predefined onload property load_after_mapping (#38209) 2023-12-02 20:06:19 +05:30
Gursheen Kaur Anand
9087e1443e
fix: SO ordered qty on PO item removal (#38378) 
* fix: update ordered_qty for SO when PO items removed

* refactor: use cached value

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-12-02 19:53:00 +05:30
rohitwaghchaure
5e9016ffab
fix: validation error has not throw for the batch (#38494) 
* fix: validation error has not throw for the batch

* chore: fix test cases
 2023-12-01 21:42:22 +05:30
s-aga-r
68f5dd3e7b fix: don't update previous doc on rate change 2023-12-01 14:45:01 +05:30
s-aga-r
68aee8c144
Merge pull request #38482 from s-aga-r/FIX-38476 
fix: `AttributeError` while saving Purchase Invoice
 2023-12-01 13:54:42 +05:30
s-aga-r
60a81a563e fix: AttributeError while saving Purchase Invoice 2023-12-01 11:27:54 +05:30
Rohit Waghchaure
691e3bb24f fix: incorrect requested quantity for the subcontracting order 2023-11-30 17:32:55 +05:30
s-aga-r
2e8739fff7
Merge pull request #38290 from s-aga-r/FIX-36704 
feat: auto create PR on SCR submission
 2023-11-29 17:57:11 +05:30
s-aga-r
874766a82f fix: map warehouses in return SCR 2023-11-29 13:07:39 +05:30
Gursheen Kaur Anand
4a047fefb8
Merge branch 'develop' into make-against-field-dynamic 2023-11-29 12:30:20 +05:30
rohitwaghchaure
fddf341f44
fix: incorrect ordered qty for Subcontracting Order (#38415) 2023-11-29 12:21:11 +05:30
Marica
b9f5a1c85d
fix: Negative Qty and Rates in SO/PO (#38252) 
* fix: Don't allow negative qty in SO/PO

* fix: Type casting for safe comparisons

* fix: Grammar in error message

* fix: Negative rates should be allowed via Update Items in SO/PO

* fix: Use `non_negative` property in docfield & emove code validation
 2023-11-27 09:05:22 +05:30
Deepesh Garg
2989e36b1d
Merge pull request #38284 from vorasmit/fetch-item-tax-values 
fix: fetch item_tax_template values if fields with fetch_from exisit
 2023-11-26 17:54:35 +05:30
Gursheen Kaur Anand
01f133f8c8
Merge branch 'develop' into make-against-field-dynamic 2023-11-24 15:23:44 +05:30
Smit Vora
b206b0583b fix: fetch item_tax_template values if fields with fetch_from exisit 2023-11-23 15:10:47 +05:30
Gursheen Anand
1657337887 chore: linting issues 2023-11-22 16:45:14 +05:30
Gursheen Anand
3543f86c63 fix: has_product_bundle util to only check for enabled bundles 2023-11-22 16:04:05 +05:30
ruthra kumar
e3af1dc864
Merge pull request #38258 from ruthra-kumar/rename_unreconcile 
refactor: rename 'Unreconcile Payments' doctype to singular 'Unreconcile Payment'
 2023-11-22 10:03:13 +05:30
ruthra kumar
74f9e34182 chore: update new unreconcile doctype name in JS and PY files 2023-11-22 05:59:20 +05:30
Anand Baburajan
9903049c7a
fix: set default asset quantity as 1 [dev] (#38223) 
* fix: make default asset quantity as 1

* fix: get rate_of_depreciation from asset category for asset auto-creation

* chore: create asset depr schedules on PR submit, not asset submit

* fix: set default asset quantity as 1

* chore: move patch from v15 to v14
 2023-11-20 22:27:16 +05:30
ruthra kumar
ce092bf23b
Merge pull request #38210 from ruthra-kumar/set_default_on_billed_amt_update 
refactor: extend billed amount update flag to POS Invoice as well
 2023-11-20 14:05:45 +05:30
ruthra kumar
ee0c64215d refactor: set default for 'update_billed_amount_in_delivery_note' 2023-11-20 12:29:35 +05:30
Dany Robert
3a487bd33a fix: wrong round off and rounded total 2023-11-18 13:32:04 +00:00
rohitwaghchaure
3e77c0b564
fix: valuation rate for the subcontracting receipt supplied items with Serial and Batch Bundle (#38094) 
fix: valuation rate for the subcontracting receipt supplied items with batch
 2023-11-14 19:27:41 +05:30
anandbaburajan
b097bb20d9 fix: unrelated transation date typo 2023-11-13 18:09:09 +05:30
ruthra kumar
6e3e094c95 refactor: ignore disabled account while selecting Income Accounts 2023-11-09 09:39:39 +05:30
Gursheen Anand
09439334ca refactor: use both fields to store against values 2023-11-08 12:57:00 +05:30
s-aga-r
5cce522ecd fix: don't reset rate if greater than zero in standalone debit note 2023-11-06 17:18:33 +05:30
Gursheen Kaur Anand
6280031722
Merge branch 'develop' into make-against-field-dynamic 2023-11-06 17:06:03 +05:30
s-aga-r
f70d779034
Merge pull request #37864 from s-aga-r/FIX-5139 
fix: permission error while creating Supplier Quotation from Portal
 2023-11-03 11:57:06 +05:30
s-aga-r
e019d43d0b fix: permission error while creating Supplier Quotation from Portal 2023-11-03 00:53:30 +05:30
Gursheen Kaur Anand
1b808e1d7c
fix: standard submit perm in repost ledger for editable invoices (#37826) 
* fix: ignore perm while reposting ledger

* fix: use flag in save

* fix: remove unnecessary save
 2023-11-02 14:01:26 +05:30
rohitwaghchaure
d91d9b02d4
Merge pull request #37849 from rohitwaghchaure/fixed-remove-voucher_type_no 
fix: remove voucher type and no for Item and Warehouse based reposting
 2023-11-02 13:26:44 +05:30
Rohit Waghchaure
0104897d69 fix: remove voucher type and no for Item and Warehouse based reposting 2023-11-02 13:24:56 +05:30
Gursheen Anand
d69b0d76dd fix: status for over delivery or billing 2023-10-25 13:59:37 +05:30
Deepesh Garg
11d956fa18
fix: Purchase Receipt GL Entries (#37642) 
* fix: Purchase Receipt GL Entries

* chore: cleanup

* test: set cwip account
 2023-10-24 14:28:19 +05:30
ruthra kumar
025acc0e48
Merge pull request #37630 from ruthra-kumar/provision_to_set_for_gain_loss_journal 
refactor: configurable exchange gain or loss posting date
 2023-10-23 21:25:48 +05:30
ruthra kumar
514d5434a3 test: varying posting date for gain loss journal 2023-10-23 12:32:10 +05:30
ruthra kumar
7e600a6494 refactor: pass gain loss posting date to controller 2023-10-23 12:12:59 +05:30
Deepesh Garg
d1ec0a6093
chore: Add missing commits back (#37618) 
* chore: Add missing commits back

* test: cwip accounting unit tests

* chore: Attribute error

* chore: Purchase Invoice tests

* chore: Missing asset account

* chore: Missing asset account

* chore: update tests

* fix: Internal transfer GL Entries
 2023-10-23 00:16:40 +05:30
rohitwaghchaure
5136fe196b
fix: remove from or target warehouse for non internal transfer entries (#37612) 2023-10-22 20:03:02 +05:30