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

45944 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Nabin Hait
666d961875 fix: GL Entries should not be splitted based on cost center allocation in PCV 2023-07-26 13:03:29 +05:30
Rohit Waghchaure
1c2da92233 fix: timeout error while cancelling the Purchase Receipt 2023-07-26 13:03:23 +05:30
Deepesh Garg
89aa6f0269
Merge pull request #36318 from barredterra/remove-autoname 
chore(Item Group): remove redundant autoname
 2023-07-26 09:44:37 +05:30
Deepesh Garg
3fe75ce7d4
Merge pull request #36319 from cogk/fix-taxes-controller-after-refactor 
fix: Fix initialize_taxes
 2023-07-26 09:41:02 +05:30
Corentin Flr
d69af741c8
fix(taxes_and_totals.js): Fix initialize_taxes incorrect refactor 
Following changes from PR #36147, `cur_frm.cscript.validate_taxes_and_charges` is not a method anymore and should be replaced with the `erpnext.accounts.taxes.validate_taxes_and_charges` function.
 2023-07-25 21:12:14 +02:00
rohitwaghchaure
17d4ab36c0
Merge pull request #36304 from frappe/mergify/bp/develop/pr-36300 
fix: added missing option Partially Received in the status field (backport #36300)
 2023-07-25 22:49:51 +05:30
Anand Baburajan
11a9d4124f
fix: apply discount on item after applying price list (#36317) 2023-07-25 21:55:17 +05:30
barredterra
1691eee26e chore(Item Group): remove redundant autoname 2023-07-25 18:05:41 +02:00
mergify[bot]
eead2bba9f
fix: group by in fixed asset register (copy #36310) (#36311) 
fix: group by in fixed asset register

(cherry picked from commit 1151e47f46a9d4a250be83e751d9e0db6881274e)

Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
 2023-07-25 20:58:41 +05:30
barredterra
fd2c272bed fix(Item Group): allow root deletion 
It was not possible to delete an empty, unused Item Group without any
children, if it was one of possibly multiple roots of the Item Group tree.
This fix allows deleting a root Item Group.
 2023-07-25 17:01:57 +02:00
Rohit Waghchaure
55a9537220 fix: added missing option Partially Received in the status dropdown field 
(cherry picked from commit 4fa93b05c62b7f340a94e9e84d9d2e132ea35b99)
 2023-07-25 12:39:07 +00:00
Gursheen Anand
341709aa0a fix: additional query cols for sales register 2023-07-25 15:57:17 +05:30
Deepesh Garg
2c1943c7e6
Merge pull request #36246 from blaggacao/bump-tweepy 
build(deps): update tweepy 3.10.0 -> 4.14.0
 2023-07-25 15:06:48 +05:30
Deepesh Garg
6830a8737a
Merge pull request #36196 from GursheenK/customer-details-in-tax-withholding-category-report 
fix: show tax withholding category details for customers
 2023-07-25 14:48:15 +05:30
Deepesh Garg
8c410c617c chore: Add default value 2023-07-25 14:47:46 +05:30
Deepesh Garg
e1d6bf364e Merge branch 'develop' of https://github.com/frappe/erpnext into customer-details-in-tax-withholding-category-report 2023-07-25 14:45:36 +05:30