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

45867 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
s-aga-r
04400eb2e4 perf: index disabled in Item 2023-07-14 17:18:55 +05:30
s-aga-r
e4128a5c91 perf: index variant_of and attribute in Item Variant Attribute 2023-07-14 17:17:24 +05:30
barredterra
dab9688410 refactor(Holiday List): use autocomplete fieldtype 2023-07-14 13:33:55 +02:00
Suraj Shetty
23bc87f2aa Merge branch 'develop' of https://github.com/frappe/erpnext into move-exotel-to-separate-app 2023-07-14 16:21:48 +05:30
barredterra
8aff5a1dab fix(Holiday List): allow empty value 2023-07-14 12:33:27 +02:00
Deepesh Garg
ac9ad8ec36
fix: Handle multi-company in patch (#36127) 
fix: Handle multi-compnay in patch
 2023-07-14 15:56:59 +05:30
barredterra
8271a39cdb fix(Holiday List): use current user's language 
For consistency with "weekly off" descriptions
 2023-07-14 12:16:49 +02:00
barredterra
509061f05b fix: German translations of Holiday List 2023-07-14 12:14:01 +02:00
barredterra
4888d75e72 feat(Holiday List): display localized country name 2023-07-14 11:59:45 +02:00
Kitti U. @ Ecosoft
3b884efca9
fix: get_dimension with_cost_center_and_project=false is not working. (#35974) 
* fix: get_dimension with_cost_center_and_project=false is not working.

with_cost_center_and_project is no python str, and it always evaluated as True, despite JS call it with false

* chore: Linting Issues

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-07-14 13:03:00 +05:30
Raffael Meyer
d5fe1432f8
fix: improve "Update Items" modal (#36105) 
* fix: make "Update Items" modal larger

* fix: remove conversion factor from overview

Conversion factor doesn't make much sense without two different UOMs
next to it, hence moving it to row detail view
 2023-07-14 12:27:35 +05:30
Deepesh Garg
b4bd978791
fix: Account balance patch and query fixes (#36117) 2023-07-14 10:28:36 +05:30
Ankush Menat
b5f6a1cc20 ci: fix repo name in relase notes workflow 
[skip ci]
 2023-07-13 21:04:09 +05:30
barredterra
fd23bd0434 test(Holiday List): weekly off and local holidays 2023-07-13 14:13:33 +02:00
barredterra
aa18b25a71 feat: add local holidays 2023-07-13 13:29:07 +02:00
Deepesh Garg
d631c7dffa
fix: Accounts closing balance patch (#36113) 2023-07-13 16:10:05 +05:30
s-aga-r
5f307f92e0
refactor: Batch Item Expiry Status report (#36106) 2023-07-13 05:44:58 +05:30
Gursheen Anand
21c993a7b3 fix: clear accounting dimension value when based on field changes 2023-07-12 20:32:08 +05:30
Gursheen Kaur Anand
596a14e34f
feat: add project filter in reports importing financial statements js file (#36097) 
feat: add project filter in financial statements js file
 2023-07-12 15:49:17 +05:30
Ankush Menat
0340bfc90d
ci: regen release notes with GH API (#36098) 
[skip ci]
 2023-07-12 12:17:20 +05:30
Deepesh Garg
0a6c565eb3
fix: Ambiguous column error while submitting stock entry 
fix: Ambiguous column error while submitting stock entry
 2023-07-12 10:18:38 +05:30
Gursheen Anand
dd8c3d5462 feat: filter based on accounting dimension in profitability analysis 2023-07-12 10:00:18 +05:30
mergify[bot]
8580287092
fix: allow manual asset receipt mov from nowhere (backport #36093) (#36094) 
fix: allow manual asset receipt mov from nowhere (#36093)

(cherry picked from commit 4aaa1a15d7dfe9ad81d3cc1f000dac3e324cfa6f)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-07-12 08:26:49 +05:30
rohitwaghchaure
59e54eabef
Merge pull request #36088 from rohitwaghchaure/fixed-reposting-circulr-dependecy 
fix: circular dependency during reposting causing timeout error
 2023-07-11 18:28:39 +05:30
Ankush Menat
7e4b6683e6 fix: Dont bold URL parts 
closes https://github.com/frappe/frappe/issues/21445
 2023-07-11 18:19:50 +05:30
Rohit Waghchaure
c16a5814d4 fix: circular dependency during reposting causing timeout error 2023-07-11 17:51:44 +05:30
s-aga-r
be5881280f
fix: incorrect status in MR created from PP (#36085) 2023-07-11 17:09:23 +05:30
Deepesh Garg
ce9164ec69
fix: Validate for missing expense account (#36078) 
* fix: Validate for missing expense account

* fix: Validate for missing expense account
 2023-07-11 12:03:38 +05:30
ruthra kumar
e44615f52b
Merge pull request #36076 from ruthra-kumar/possible_type_error_on_err_creation 
fix: possible type error on ERR creation
 2023-07-11 10:37:37 +05:30
ruthra kumar
176966daab fix: possible type error on ERR creation 2023-07-11 10:04:17 +05:30
Raffael Meyer
bf84e0d441
refactor: remove frappe.dynamic_link (#35096) 2023-07-10 21:22:06 +05:30
mergify[bot]
872a23c77d
fix: also check on_hold (#35910) 
fix: also check on_hold (#35910)

(cherry picked from commit 5aa02b8571efdc1710a9b3069a18a80ed17856a2)

Co-authored-by: RJPvT <48353029+RJPvT@users.noreply.github.com>
 2023-07-10 20:34:54 +05:30
Dany Robert
361a357088
fix: payment entry voucher_type error (#35779) 
* fix: payment entry `voucher_type` error

* chore: linters
 2023-07-10 19:32:59 +05:30
Wolfram Schmidt
49c61e7ebb
fix: Add company filter in list view (#36047) 
fix: Add company filter in list view
 2023-07-10 18:03:50 +05:30
rohitwaghchaure
06dcc4ed96
Merge pull request #36063 from rohitwaghchaure/fixed-valuation-for-dn-return 
fix: Delivery Note return valuation
 2023-07-10 17:48:41 +05:30
Rohit Waghchaure
6a10ae662c fix: Delivery Note return valuation 2023-07-10 17:06:02 +05:30
Dany Robert
5c820ecc20
fix: precision causing outstanding issue on partly paid invoices (#36030) 
* fix: precision causing outstanding issue on partly paid invoices

* chore: linters
 2023-07-10 16:20:45 +05:30
mergify[bot]
b3a99e38cc
chore: add asset depr posting error in error log (backport #36052) (#36055) 
chore: add asset depr posting error in error log (#36052)

(cherry picked from commit 0f9a6ee70acc88a1190fc66fb95a3bd5d6dea02f)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-07-10 14:31:19 +05:30
MohsinAli
2816076789
1052, "Column 'qty' in field list is ambiguous in work_order.py 2023-07-10 14:09:41 +05:30
rohitwaghchaure
22eee472dd
Merge pull request #36001 from rohitwaghchaure/fixed-added-validation-for-rejected-warerhouse 
fix: accepted warehouse and rejected warehouse can't be same
 2023-07-10 13:55:20 +05:30
rohitwaghchaure
b16f364866
Merge pull request #36054 from rohitwaghchaure/fixed-incorrect-stock-levels 
fix: incorrect stock levels in the Batch
 2023-07-10 13:35:59 +05:30
Rohit Waghchaure
d618aaef32 fix: accepted warehouse and rejected warehouse can't be same 2023-07-10 13:19:17 +05:30
Rohit Waghchaure
aeaf8fd89c fix: incorrect stock levels in the Batch 2023-07-10 13:03:10 +05:30
ruthra kumar
3ef034dda8
Merge pull request #36051 from ruthra-kumar/auto_exchange_rate_revaluation_creation 
feat: Provision to auto create Exchange Rate Revaluation
 2023-07-10 12:59:23 +05:30
Ankush Menat
407642869a ci: auto release beta version 
[skip ci]
 2023-07-10 12:48:47 +05:30
aioaccount
46fe9ac5cd
fix: labels and translations (#35963) 
fix: labels and translations
* fix: Vietnamese translation of customer
* fix: Vietnamese translation of bill
 2023-07-09 20:41:52 +05:30
Gursheen Kaur Anand
674af15696
fix: deferred accounting entries on accounts frozen (#35978) 
* fix: accounts frozen entries in deferred accounting

* test: accounts frozen date in deferred accounting

* fix: reset account settings after running test

* fix: resolve conflicts

* fix: modify expected gle when deferred accounting is disabled through JE

* fix: change posting date when accounts not frozen
 2023-07-09 20:41:12 +05:30
Raffael Meyer
af28f95c60
refactor(Payment Entry): translatable strings (#36017) 
* refactor(Payment Entry): translatable strings

* fix: German translations
 2023-07-09 20:19:53 +05:30
aioaccount
ef7fd7548c
fix: Vietnamese translation of "Company" (#35887) 
fix: Vietnamese translation of "Company"
 2023-07-09 20:17:35 +05:30
Deepesh Garg
4d07e20b05
fix: Opening balance in presentation currency in Trial Balance report (#36036) 2023-07-09 20:16:12 +05:30