Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
45,975 Commits 3 Branches 0 Tags 1 GiB
05b07e098a
Commit Graph

45975 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
xdlumertz
05b07e098a
fix: process_owner is not link User (#36420) 
-Changed "fetch from" since field is not a binding field
-Change field "full_name" from Hidden to Read Only
 2023-07-31 17:34:55 +05:30
Gursheen Kaur Anand
1ddfaa7605
fix: ignore cancelled gle in voucher-wise balance report (#36417) 
fix: ignore cancelled gle
 2023-07-31 14:29:20 +05:30
Deepesh Garg
c6d8f15b10
Merge pull request #36389 from AlexandreLumertz/patch-2 
fix: Party type translation in error message
 2023-07-30 18:42:01 +05:30
Deepesh Garg
c6b024c34b
Merge pull request #36167 from barredterra/percentage-rounding 
fix: rounding of percentage fields
 2023-07-30 14:41:30 +05:30
Deepesh Garg
b38d300a92
Merge pull request #36320 from barredterra/german-translation-supplier 
fix(Supplier): german translations
 2023-07-30 14:40:15 +05:30
Deepesh Garg
eeddeeeeb3
Merge pull request #36369 from ashish-greycube/patch-11 
fix: in payment_entry 'Unallocated Amount' cal is broken
 2023-07-30 14:37:24 +05:30
Ankush Menat
c0642cf528
fix: only publish repost progress to doc subscriber (#36400) 
Huge size of string gets blasted to everyone on site. Due to some memory
leak (cause unknown) till sockets are open the strings are also in
process' memory.

related https://github.com/frappe/frappe/issues/21863
 2023-07-29 09:32:11 +00:00
rohitwaghchaure
b71dafd1f1
Merge pull request #36375 from ramonus/job-card-fix 
fix: Job Card validation fixed when displaying total completed quantity
 2023-07-29 15:01:16 +05:30
Deepesh Garg
caad4537c5
Merge pull request #36149 from GursheenK/balancing-accounting-dimensions 
fix: make offsetting entry for acc dimensions in general ledger
 2023-07-29 12:29:03 +05:30
Deepesh Garg
f999b75ed6 Merge branch 'develop' of https://github.com/frappe/erpnext into balancing-accounting-dimensions 2023-07-29 11:53:03 +05:30
Deepesh Garg
ecca9cb023 fix: Add company filters for account 2023-07-29 11:52:54 +05:30
Deepesh Garg
3173546d5c
Merge pull request #36198 from HarryPaulo/fix-pricing-rule-on-point-of-sale 
fix: inserting of items with pricing rule with qty range
 2023-07-29 09:58:05 +05:30
ruthra kumar
3b58055410
refactor(test): introduce and make use of mixins in unit tests (#36382) 
* refactor(test): create and use test mixin

* chore(test): replace get_user_default with variable
 2023-07-28 21:02:21 +05:30
xdlumertz
bc470591ac
fix: translate 
fix: translate
 2023-07-28 12:31:29 -03:00
rohitwaghchaure
ee7da639e7
Merge pull request #36380 from rohitwaghchaure/fixed-fieldtype-from-currency-to-flt 
fix: change fieldtype from Currency to Float for the valuation rate in reports
 2023-07-28 20:35:46 +05:30
s-aga-r
bc6cbb9e25
Merge pull request #36365 from AlexandreLumertz/patch-1 
fix: removed "fetch_from"
 2023-07-28 18:12:21 +05:30
xdlumertz
1c687a4afd fix: removed "fetch_from" 
* fix: removed ("fetch_from": "goal.objective")
The field ended up being disabled because of this.
 2023-07-28 18:10:45 +05:30
s-aga-r
d9ac7f9b87
Merge pull request #36221 from s-aga-r/FIX-ISS-23-24-02079 
perf: use `LEFT JOIN` instead of `NOT EXISTS`
 2023-07-28 17:51:24 +05:30
rohitwaghchaure
4e58503075
Merge pull request #36377 from rohitwaghchaure/fixed-pp-sub-assembly-available-items 
fix: multiple issues related to Production Plan
 2023-07-28 17:26:06 +05:30
Rohit Waghchaure
c82cb379a5 fix: change fieldtype from Currency to Float for the valuation rate in the stock report 2023-07-28 17:21:05 +05:30
s-aga-r
148d466ae5 fix: long queue process_boms_cost_level_wise 2023-07-28 17:05:17 +05:30
s-aga-r
58d867503b perf: use LEFT JOIN instead of NOT EXISTS 2023-07-28 16:44:41 +05:30
Rohit Waghchaure
1c2148b637 fix: multiple issues related to Production Plan 2023-07-28 15:38:00 +05:30
ramonalmato
49981fecc7 fix: Job Card validation fixed when displaying total completed quantity 2023-07-28 10:57:31 +02:00
Ankush Menat
e36c8ce5be
perf: move project status reminder to hourly (#36372) 
Only used for sending daily/weekly/bi-daily

[skip ci]
 2023-07-28 12:53:22 +05:30
Ashish Shah
f9fa34ff40
fix: in payment_entry 'Unallocated Amount' cal is broken 2023-07-28 11:10:51 +05:30
ruthra kumar
50d294fd1e
Merge pull request #36126 from ruthra-kumar/idx_issue_upon_journal_reconciliation 
fix: incorrect `idx` on Journals after reconciliation
 2023-07-28 09:33:29 +05:30
rohitwaghchaure
dac9fd64a8
Merge pull request #36328 from rohitwaghchaure/fixed-purchase-receipt-timeout-on-cancel-develop 
fix: timeout error while cancelling the Purchase Receipt
 2023-07-27 23:26:59 +05:30
Deepesh Garg
829387c2bc
Merge pull request #36360 from deepeshgarg007/fy_default_dates 
fix: Default year start and end dates in reports
 2023-07-27 22:35:35 +05:30
Deepesh Garg
fff83bc847
Merge pull request #36092 from HarryPaulo/fix-paid-amount-payment-method-group 
fix: paid_amount when the group is mode of payment
 2023-07-27 21:21:52 +05:30
Deepesh Garg
ebdf1959fd
Merge pull request #36254 from deepeshgarg007/remove_auto_repeat 
fix: Remove auto repeat (subscription) button from Sales and Purchase documents
 2023-07-27 21:18:03 +05:30
Deepesh Garg
a25f34c3d5
Merge pull request #36313 from barredterra/delete-root-item-group 
fix(Item Group): allow root deletion
 2023-07-27 21:14:44 +05:30
Deepesh Garg
2341061852 fix: Default year start and end date in reports 2023-07-27 21:03:32 +05:30
Deepesh Garg
4496a6760e fix: Default year start and end dates in reports 2023-07-27 20:54:55 +05:30
Deepesh Garg
dacf013170
Merge pull request #36347 from deepeshgarg007/ac_ignore 
fix: Ignore account closing balance for financial statement
 2023-07-27 19:54:01 +05:30
Deepesh Garg
523d2c38eb
Merge pull request #36356 from frappe/revert-36249-default_dates 
Revert "fix: Default year start and end dates in reports"
 2023-07-27 19:15:00 +05:30
Deepesh Garg
cf50bb45ad
Revert "fix: Default year start and end dates in reports" 2023-07-27 19:13:11 +05:30
Deepesh Garg
3db6ac5ac9
Merge pull request #36069 from GursheenK/purchase-sales-register-with-PE/JE 
feat: include payments in purchase / sales register report
 2023-07-27 18:13:37 +05:30
Gursheen Anand
4f9242d699 fix: dimension name in remark 2023-07-27 15:45:48 +05:30
Deepesh Garg
ccf1920a78 fix: Ignore account closing balance for financial statement 2023-07-27 15:40:36 +05:30
Rucha Mahabal
5d87c06332
refactor: remove hrms app translations (#36343) 2023-07-27 12:30:23 +05:30
Deepesh Garg
5dc8195d91
Merge pull request #36249 from deepeshgarg007/default_dates 
fix: Default year start and end dates in reports
 2023-07-27 12:19:44 +05:30
Ankush Menat
1d7dbd3456
perf: don't use ifnull where it's not required (#36336) 
ifnull isn't really required when doing `!= 'anything'` because if it's null then value will be falsy.
ifnull is only required when checking `= ''` if you treat `null = ''`

Actuall better fix would be make things explcitly non-nullable, then we won't ever have to add this on such fields.

ref: https://github.com/frappe/frappe/pull/21822
 2023-07-27 06:06:07 +00:00
Nabin Hait
56e7cc7e05
Merge pull request #36327 from nabinhait/pcv-fix 
fix: GL Entries should not be split based on cost center allocation in PCV
 2023-07-27 11:33:06 +05:30
Gursheen Anand
b1818137e7 fix: PE in sales register 2023-07-27 10:08:26 +05:30
Anand Baburajan
5e7b05e566
chore: adding totals in asset reports (#36334) 2023-07-26 21:57:18 +05:30
ruthra kumar
e79f80331d
Merge pull request #36322 from frappe/mergify/bp/develop/pr-36298 
fix: show invoices name instead of object address (backport #36298)
 2023-07-26 16:11:56 +05:30
Anand Baburajan
f28f8dc596
fix: show depr schedule table in asset doc (#36332) 2023-07-26 15:59:37 +05:30
Deepesh Garg
f368894d22
Merge pull request #36238 from RitvikSardana/develop-ritvik-pos-dark 
fix: POS closing with item name
 2023-07-26 15:33:44 +05:30
gouravengineer
a5b626420d fix: show invoices name instead of object address 
comma_and function in expecting a list but it gets a tuple so it is returning a object instead of a string

(cherry picked from commit cf93714a7cce465d241bf4e713ee7492c5c01bfa)
 2023-07-26 15:30:03 +05:30