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

33888 Commits

Author SHA1 Message Date
Rohit Waghchaure
ae31ff1c48 fix: disabled items showing in the report 'Itemwise Recommended Reorder Level 
'
 2022-12-15 17:05:53 +05:30
Nabin Hait
5ea6080a6e
Merge pull request #33300 from ssiyad/fix/pos/var_typo 
fix(pos): variable typo: `s_pos` -> `is_pos`
 2022-12-13 15:21:10 +05:30
Nabin Hait
c5d21b2461
Merge pull request #33314 from s-aga-r/fix/github-issue/33145 
fix: `Enough Parts to Build` in `BOM Stock Report`
 2022-12-13 15:19:40 +05:30
ruthra kumar
3db446e35a
Merge pull request #33313 from nabinhait/tax_detail_report_perm_issue 
fix: Permission issue in Tax Detail report
 2022-12-13 14:27:08 +05:30
Sagar Sharma
f9be137cf5
Merge branch 'develop' into fix/github-issue/33145 2022-12-13 14:00:51 +05:30
s-aga-r
723c64ba73 fix: Enough Parts to Build in BOM Stock Report 2022-12-13 14:00:30 +05:30
Nabin Hait
aa787e4030 fix: Permission issue in Tax Detail report 2022-12-13 13:16:24 +05:30
ruthra kumar
2175784142
Merge pull request #33303 from ruthra-kumar/incorrect_balance_on_consolidate_balance_sheet 
fix: incorrect balance on parent company on consolidate Balance sheet due to key mismatch
 2022-12-13 09:04:13 +05:30
s-aga-r
78b438f6cf fix: Material Request reference in internal Sales Order 2022-12-12 22:41:44 +05:30
ruthra kumar
7b3316dc31 fix: incorrect balance on parent company due to key mismatch 2022-12-12 20:15:59 +05:30
rohitwaghchaure
5c0f8ee44f
Merge pull request #33281 from tundebabzy/29976 
fix: maintain same rate throughout sales cycle doesn't work with quotation
 2022-12-12 19:30:50 +05:30
Sabu Siyad
7d64bf78cf
fix(pos): variable typo: s_pos -> is_pos 
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
 2022-12-12 19:09:00 +05:30
Ankush Menat
915e0347b0
chore!: remove activity log feeds (#33294) 
- This contains little to no information and practically no one uses this.
- Also causes a lot of problem by adding way too many feeds in activity
  log to the point where activity page doesn't even load.
 2022-12-12 15:14:30 +05:30
Ankush Menat
593626f502
perf: add indexes on payment entry reference (#33288) 
Adds index on:
1. reference doctype
2. reference name

*Why not composite index?*

There are three type of queries on this doctype

- filtering ref_doctype - doctype index helps here
- filtering ref_name - name index helps here
- filtering both - name index helps here too. Since it has sufficiently
  high cardinality. Composite index wont help in case where ref_doctype
  isn't specfied.


[skip ci]
 2022-12-12 12:58:11 +05:30
Tunde Akinyanmi
71aa8c5e1c test: refactor test case 2022-12-09 14:33:54 +01:00
Tunde Akinyanmi
d193a14b8f test: ensure test case sets Selling Settings 2022-12-09 14:09:54 +01:00
Tunde Akinyanmi
97ddfcfc7c fix: Maintain Same Rate Throughout Sales Cycle doesn't work 
Issue #29976 was partly fixed by #32923 but the problem still persists.
The reason is because an incorrect fieldname was passed to the
`validate_rate_with_reference_doc` method.
This commit fixes it
 2022-12-09 10:29:28 +01:00
Deepesh Garg
6db52930d8 Merge branch 'develop' of https://github.com/frappe/erpnext into buying_selling_pricing_rule 2022-12-08 18:05:05 +05:30
Deepesh Garg
6192af5cf0 chore: Update tests 2022-12-08 18:04:40 +05:30
Deepesh Garg
b179514273
Merge pull request #33269 from ssiyad/fix/ecommerce/breadcrumb_base 
fix(ecommerce): remove query parameters from referrer
 2022-12-08 17:11:34 +05:30
Sabu Siyad
b6bd408f19
fix(ecommerce): remove query parameters from referer 
inclusion of query parameters results in logic failure

example:
- logic check if referrer is `all-products`
- `http://shop.example/all-products` -> `all-products`, valid outcome
- `http://shop.example/all-products?start=1` -> `all-products?start=1`,
  invalid outcome

Signed-off-by: Sabu Siyad <hello@ssiyad.com>
 2022-12-08 16:47:50 +05:30
Ankush Menat
0b86b1baca
refactor: make payments app a soft dependency (#33245) 
refactor: make payment app a soft dependency
 2022-12-08 16:40:13 +05:30
Deepesh Garg
07c815f35f
Merge pull request #33253 from niyazrazak/patch-9 
feat: get lead with WhatsApp number
 2022-12-08 15:19:13 +05:30
Deepesh Garg
81397ba3ee
Merge pull request #33227 from barredterra/add-translation-variable-order 
fix: add translation variable index
 2022-12-08 15:17:07 +05:30
Deepesh Garg
f0487451f7
Merge pull request #33248 from QwQuan/develop 
fix: bugs in zh.csv
 2022-12-08 15:16:16 +05:30
ruthra kumar
1d37c0143f
Merge pull request #33254 from ruthra-kumar/index_error_on_customer_master 
fix: index error on customer master
 2022-12-08 12:52:20 +05:30
Rohit Waghchaure
f598da7c81 fix: total value in Warehouse Wise Stock Balance 2022-12-08 00:55:45 +05:30
s-aga-r
632c08f7e0 fix: order status in Production Planning Report 2022-12-07 22:47:06 +05:30
ruthra kumar
cf1e3dc8ea fix: index error on customer master 2022-12-07 20:48:40 +05:30
MOHAMMED NIYAS
922375c3ba
feat: get lead with WhatsApp number 2022-12-07 17:50:35 +05:30
wuzhouquan
a6fe79f29d fix: bugs in zh.csv 2022-12-07 15:04:56 +08:00
rohitwaghchaure
7cbb6c4de9
Merge pull request #33236 from rohitwaghchaure/feat-warehouse-wise-stock-balance 
feat: warehouse wise stock balance
 2022-12-06 17:58:31 +05:30
Deepesh Garg
b602a0dcb0
Merge pull request #33146 from barredterra/reload-currency-exchange-settings 
fix: reload Currency Exchange Settings in patch
 2022-12-06 17:38:13 +05:30
Deepesh Garg
26adbc6282
Merge pull request #33192 from deepeshgarg007/bundle_item_rates 
fix: Bundle item rates
 2022-12-06 17:37:22 +05:30
Rohit Waghchaure
861aa9e08a feat: warehouse wise stock balance 2022-12-06 17:33:33 +05:30
Deepesh Garg
c1a82dc9e5
Merge pull request #33191 from ruthra-kumar/key_error_in_profit_loss_report 
fix: key error while filtering on date range and reporting on foreign currency
 2022-12-06 15:42:53 +05:30
Deepesh Garg
b1242bc56c chore: Update tests 2022-12-06 15:14:48 +05:30
Deepesh Garg
af1f98e188 Merge branch 'develop' of https://github.com/frappe/erpnext into bundle_item_rates 2022-12-06 13:59:51 +05:30
Deepesh Garg
e5566b31d5 chore: Consider bundle qty as well 2022-12-06 13:59:45 +05:30
ruthra kumar
a6794c3606 fix: key error on p/l and balance sheet reports on foreign currency 2022-12-06 13:48:46 +05:30
ruthra kumar
19db7e2989 fix: replace sql code with fields list in get_cached_value 2022-12-06 13:48:46 +05:30
Deepesh Garg
01b84a9751
Merge pull request #33194 from barredterra/validate-employee-dates 
refactor: validate dates in Employee
 2022-12-06 12:34:15 +05:30
Deepesh Garg
3aa6f97420
Merge pull request #33216 from barredterra/validate-accounts-dates 
refactor: validate dates in accounts module
 2022-12-06 12:33:01 +05:30
Deepesh Garg
63393fa503
Merge pull request #33217 from barredterra/validate-project-dates 
refactor: validate dates in project and task
 2022-12-06 12:32:27 +05:30
Deepesh Garg
921f8edde8
Merge pull request #33219 from deepeshgarg007/internal_transfer_editable_rate 
fix: Allow item rate updates for non-stock invoices
 2022-12-06 09:12:24 +05:30
Raffael Meyer
5853b80d25
Merge branch 'develop' into reload-currency-exchange-settings 2022-12-06 02:30:55 +01:00
Raffael Meyer
8301d3b13f
Merge branch 'develop' into key_error_in_profit_loss_report 2022-12-06 02:08:47 +01:00
barredterra
a26a29f33b fix: incorrect dates in test records 2022-12-05 19:49:05 +01:00
Raffael Meyer
a074ffa880
Merge branch 'develop' into validate-employee-dates 2022-12-05 19:38:01 +01:00
Raffael Meyer
e526a0e282
Merge branch 'develop' into validate-accounts-dates 2022-12-05 19:37:54 +01:00