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

47275 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gursheen Anand
ab6e92aae1 fix: limit end date to current date 2023-12-04 16:47:28 +05:30
rohitwaghchaure
c8693cdf37
fix: scan for serial or batch in bundle (#38534) 2023-12-04 15:02:47 +05:30
NIYAZ RAZAK
3df1d75bdd
fix: incorrect customer outstanding amount (#38475) 
* fix: incorrect customer outstanding amount

* chore: resolve linting error

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

---------

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2023-12-04 13:39:49 +05:30
s-aga-r
fc12238fcc
Merge pull request #38543 from s-aga-r/FIX-6734 
fix: don't show non-stock items in Stock Analytics report
 2023-12-04 12:08:07 +05:30
s-aga-r
15fff84bb5 fix: linter 2023-12-04 12:05:27 +05:30
s-aga-r
01aadbef85 fix: don't show non-stock items in Stock Analytics report 2023-12-04 12:00:36 +05:30
s-aga-r
ccdcb7dfcc fix(ux): stock-item filter for Item Code field 2023-12-04 11:58:44 +05:30
ruthra kumar
94fabe0321
Merge pull request #38220 from rtdany10/wrong-advance 
fix: exclude `invoice_doctypes` from party advance
 2023-12-04 10:57:15 +05:30
ruthra kumar
dd39da0b77
fix: incorrectly treating normal payment as advance (#38437) 
fix: treating normal payment as advance
 2023-12-04 10:08:37 +05:30
Nihantra C. Patel
d659d407a0
fix: Group By in Item-wise Purchase Register (#38503) 2023-12-03 23:22:04 +05:30
ruthra kumar
2815d196de
Merge pull request #38525 from ruthra-kumar/multiple_minor_fixes 
fix: multiple minor fixes in report and Exchange Rate Revaluation
 2023-12-03 16:43:01 +05:30
ruthra kumar
64266c4d38 fix: remove hardcoded, implicit rounding loss allowance 2023-12-03 10:58:14 +05:30
ruthra kumar
f4d418ea6d fix: item group filter in sales person wise report 2023-12-03 10:58:10 +05:30
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
rohitwaghchaure
74eab91042
fix: better overlap logic for job card (#38432) 2023-12-02 23:12:12 +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
Raffael Meyer
5952cfa673
fix: german translations for Lost Quotations (#38435) 2023-12-02 19:52:11 +05:30
noec764
a1e0197a8b
fix: Add missing french translations (#38368) 
fix: Add missing french translation

Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
 2023-12-02 19:49:13 +05:30
Deepesh Garg
af7bc4f178
Merge pull request #38401 from pps190/fix-pe-jv-outstanding 
fix: don't consider cancelled entries
 2023-12-02 19:44:10 +05:30
Corin Wenger
023bc36592
fix: Move SMS Log module from ERPNext to Frappe (#38506) 
Move SMS Log module from ERPNext to Frappe

SMS Log module moved to Frappe Core from ERPNext Utilities so that Frappe send_sms() works sans-ERPNext.
 2023-12-02 19:24:46 +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
Sherin KR
6bc40373f2
chore: changed sort_order to DESC for customer (#38498) 2023-12-01 19:07:28 +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
Ernesto Ruiz
b24e28953b
chore: add translate function to email subject in digest frecuency (#38474) 
chore: add translate function to email subject in digest frecuency
 2023-12-01 12:41:14 +05:30
ruthra kumar
9656412bba
Merge pull request #38440 from rtdany10/pe-split-message 
fix(pe): show split alert only on splitting
 2023-12-01 12:39:39 +05:30
ruthra kumar
61280117eb
Merge pull request #38393 from ruthra-kumar/refactor_advance_as_liability 
refactor: GL entries build logic for `Advance in Separate Party Account` option.
 2023-12-01 12:36:59 +05:30
ruthra kumar
961bdf0d24 refactor: handle forex payment advance entries 2023-12-01 12:13:00 +05:30
ruthra kumar
080aa30407 refactor(test): filter on document names 2023-12-01 12:09:37 +05:30
ruthra kumar
eecf9cd1d8 fix(test): use correct account type for testing 2023-12-01 11:43:57 +05:30
NandhiniDevi
e2a519464b
add supplier group filter in purchase register (#38421) 
* add supplier group field in purchase register

* Update purchase_register.js
 2023-12-01 11:34:38 +05:30
s-aga-r
60a81a563e fix: AttributeError while saving Purchase Invoice 2023-12-01 11:27:54 +05:30
Gughan Ravikumar
3a66aefd2c
fix: show item name as title instead of item group in BOM (#38478) 
Item fields in BOM used to show Item Group when Items were set to show title as link fields. Now they show Item Name instead
 2023-12-01 11:07:17 +05:30
Ankush Menat
54f7cf59fd chore: version bump 2023-12-01 10:37:35 +05:30
rohitwaghchaure
ba10f7d04c
Merge pull request #38455 from rohitwaghchaure/fixed-incorrect-requested-qty-in-mr-for-sco 
fix: incorrect requested quantity for the subcontracting order
 2023-11-30 19:07:55 +05:30
Rohit Waghchaure
691e3bb24f fix: incorrect requested quantity for the subcontracting order 2023-11-30 17:32:55 +05:30
s-aga-r
832734ff4c
Merge pull request #38450 from s-aga-r/FIX-38151 
fix(ux): make valuation field read only when it can't be modified
 2023-11-30 17:22:54 +05:30
s-aga-r
3d4156cc7d fix(ux): make PI rate field read-only having PR ref 2023-11-30 16:28:03 +05:30
ruthra kumar
cc053ad894
Merge pull request #38457 from ruthra-kumar/use_flt_on_outstanding_on_ar_ap_summary 
refactor: use flt on outstanding on AR/AP summary report
 2023-11-30 16:23:28 +05:30
s-aga-r
ae294ee470 fix(ux): make PR rate field read-only having PO ref 2023-11-30 16:16:12 +05:30
ruthra kumar
e4bdd3a28d refactor: use flt on outstanding on AR/AP summary report 2023-11-30 15:57:57 +05:30
Ankush Menat
63313eef6f
feat: enable automatic type annotations (#38452) 2023-11-30 08:23:48 +00:00
Ankush Menat
1da9087cc4
refactor: Simpler log settings setup (#38449) 
Depends on https://github.com/frappe/frappe/pull/23507
 2023-11-30 07:58:55 +00:00
ruthra kumar
de3795a7d4
Merge pull request #38446 from ruthra-kumar/filter_bug_on_payment_reconciliation 
refactor: pass on filter to up front outstanding query as well
 2023-11-30 12:54:46 +05:30
ruthra kumar
cfd3230c75 refactor: pass on filter to upfront outstanding query as well 2023-11-30 12:22:55 +05:30
s-aga-r
e38b06bf2d
Merge pull request #38441 from s-aga-r/FIX-38434 
fix: exploded items in Subcontracting Receipt
 2023-11-30 12:10:18 +05:30
s-aga-r
7cb0b1b7c3
Merge pull request #38439 from s-aga-r/FIX-38433 
fix: use `docstatus` instead of `status`
 2023-11-30 12:09:43 +05:30
s-aga-r
62b4a263f8 fix: exploded items in Subcontracting Receipt 2023-11-30 12:07:52 +05:30
Dany Robert
96b13c59c1 fix(pe): show split alert only on splitting 2023-11-30 06:20:15 +00:00