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

47210 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gursheen Anand
ef8e4191cd fix: set cwip account before asset tests 2023-11-29 18:25:52 +05:30
rohitwaghchaure
cf97e3c21f
Merge pull request #38427 from Nandhinidevi123/stock_entry 
Update Serial No issue
 2023-11-29 18:11:22 +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
3da0aa6a0b fix(test): test_auto_create_purchase_receipt 2023-11-29 17:35:21 +05:30
Nandhinidevi123
97be527ee9 fix:change default qty 2023-11-29 17:21:51 +05:30
Nandhinidevi123
cac3b4a0d8 Merge branch 'develop' of https://github.com/Nandhinidevi123/erpnext into develop 2023-11-29 17:20:38 +05:30
Deepesh Garg
85f9f8d176
Merge pull request #38250 from GursheenK/unset-discount-amount-based-on-coupon-code 
fix: unset discount amount based on coupon code
 2023-11-29 15:53:46 +05:30
s-aga-r
7b0cd03f88 test: auto create PR on SCR submit 2023-11-29 14:10:48 +05:30
s-aga-r
68585f6f2b test: auto create SCO on PO submit 2023-11-29 13:58:36 +05:30
s-aga-r
857f2b5a01 chore: linter 2023-11-29 13:39:14 +05:30
rohitwaghchaure
258148b615
Merge pull request #38365 from Nandhinidevi123/sales_register 
feat:add customer group filter in sales register
 2023-11-29 13:37:22 +05:30
s-aga-r
7145b040f1 fix(ux): hide Create Purchase Receipt button for Subcontract Return 2023-11-29 13:21:24 +05:30
s-aga-r
874766a82f fix: map warehouses in return SCR 2023-11-29 13:07:39 +05:30
s-aga-r
096a2c8cd0 chore: PR ref in SCR connections 2023-11-29 12:46:31 +05:30
rohitwaghchaure
fddf341f44
fix: incorrect ordered qty for Subcontracting Order (#38415) 2023-11-29 12:21:11 +05:30
Anand Baburajan
fe5fc5bd3a
feat: shift depreciation for assets (#38327) 
* feat: shift depreciation for assets

* chore: create new asset depr schedule on shift change

* refactor: move create_depr_schedule to after_insert

* fix: args in get_depreciation_amount test

* refactor: rename shift adjustment to shift allocation

* chore: asset shift factor doctype and auto allocate shift diff

* chore: use check instead of depr type, and add tests

* chore: make linter happy

* chore: give permissions to accounts users
 2023-11-29 12:14:12 +05:30
s-aga-r
2b0b15f4d1
Merge pull request #38394 from s-aga-r/FIX-38330 
fix: `OperationalError` while selecting Serial No in `Warranty Claim`
 2023-11-29 10:37:07 +05:30
Patrick Eissler
8e4b591ea2
fix: make create button translatable (#38165) 
* fix: make all create buttons translatable

* style: use double quotes

---------

Co-authored-by: PatrickDenis-stack <77415730+PatrickDenis-stack@users.noreply.github.com>
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2023-11-29 10:22:47 +05:30
Dany Robert
663bb8726c
fix(regional): use net figures for sales calc (#38260) 2023-11-29 09:03:47 +05:30
s-aga-r
9fadf5f426 refactor: don't use cur_frm 2023-11-28 21:34:07 +05:30
Shariq Ansari
458dd51af7
Merge pull request #38398 from shariquerik/create-contact-only-if-not-exist 2023-11-28 19:49:22 +05:30
Shariq Ansari
23b0b8ba36 fix: create contact if existing customer doesn't have contact 2023-11-28 19:24:15 +05:30
rohitwaghchaure
592fc81260
fix: serial no status (#38391) 2023-11-28 18:28:48 +05:30
Gursheen Kaur Anand
c232acbe9b
Merge pull request #38392 from GursheenK/report-rename-import 
fix: imports for renamed report
 2023-11-28 18:22:59 +05:30
s-aga-r
640dfab827 refactor: use frm.set_query to add filters 2023-11-28 17:45:17 +05:30
s-aga-r
01044ca8e9 refactor: use DocType Fetch From instead of frm.add_fetch 2023-11-28 17:33:27 +05:30
s-aga-r
1763824e5f refactor: use arrow function 2023-11-28 17:20:05 +05:30
Gursheen Anand
aee2e12f39 chore: fix imports for renamed report 2023-11-28 17:11:35 +05:30
s-aga-r
500573067a Merge branch 'develop' into FIX-36704 2023-11-28 17:01:48 +05:30
s-aga-r
8052103197 feat: provision to create PR from SCR 2023-11-28 16:28:54 +05:30
Raffael Meyer
8f00481c5f
fix: no fstring in translation (#38381) 2023-11-28 09:35:28 +00:00
s-aga-r
9872e371a2
Merge pull request #38377 from s-aga-r/FIX-PB-SEARCH-INPUT 
fix: Product Bundle Parent Item input
 2023-11-28 14:34:26 +05:30
s-aga-r
37b3ac7952 feat: SCR Item ref in PR Item 2023-11-28 13:39:15 +05:30
s-aga-r
d891bd7fac feat: Subcontracting Receipt ref in Purchase Receipt 2023-11-28 13:27:27 +05:30
s-aga-r
d366a91d9e fix: use checkbox instead of select field 2023-11-28 13:06:52 +05:30
s-aga-r
8c3713b649 fix: don't select all fields 2023-11-28 11:12:55 +05:30
s-aga-r
729fc738af fix: product bundle search input 2023-11-28 11:08:52 +05:30
Deepesh Garg
add238c892
fix: debit credit mismatch in multi-currecy asset purchase receipt (#38342) 
* fix: Debit credit mimatch in multicurrecy asset purchase receipt

* test: multi currency purchase receipt

* chore: update init files

* test: roolback
 2023-11-28 08:21:45 +05:30
rohitwaghchaure
ad3634be7c
chore: fix flaky test case (#38369) 2023-11-28 06:24:21 +05:30
Sagar Vora
5a53a4b044
fix: make parameters of create_subscription_process optional (and other minor fixes) (#38360) 2023-11-27 20:21:19 +05:30
Nandhinidevi123
5a97fa6336 feat:add customer group filter in sales register 2023-11-27 19:51:05 +05:30
ruthra kumar
657bb9d682
Merge pull request #38354 from ruthra-kumar/handle_rounding_loss_on_ar_ap 
refactor: handle rounding loss on AR/AP reports
 2023-11-27 11:51:46 +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
ruthra kumar
592ce45da7 refactor: handle rounding loss on AR/AP reports 2023-11-27 08:51:22 +05:30
NandhiniDevi
d9b3b95854
fix : Payment Reco Issue and chart of account importer (#38321) 
fix : Payment Reco Issue and chart of account importer
 2023-11-26 18:40:31 +05:30
Raffael Meyer
5426b93387
refactor: bank transaction (#38182) 2023-11-26 18:37:55 +05:30
Monolithon Administrator
284a40aa63
fix: Add name to Hungary - Chart of Accounts for Microenterprises json (#38278) 
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-11-26 18:17:10 +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
rohitwaghchaure
d8245cef72
fix: job card overlap validation (#38345) 2023-11-26 16:13:39 +05:30
s-aga-r
edf4514d8b
Merge pull request #38261 from s-aga-r/FIX-STOCK-RESERVATION-DIALOG-BOX 
fix(ux): Sales Order Stock Reservation Dialog
 2023-11-26 11:02:02 +05:30