Sagar Sharma
cb49055aac
Merge pull request #33304 from s-aga-r/fix/so-mr-ref
...
fix: `Material Request` reference in internal `Sales Order`
2022-12-12 23:48:14 +05:30
barredterra
e057e1dfe7
feat: incoterm named place
2022-12-12 18:49:47 +01:00
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
anandbaburajan
28d4942d6c
chore: fix validation and add make_schedules_editable
2022-12-12 18:19:34 +05:30
anandbaburajan
1ea2ba0dea
chore: handle some cases where asset_depr_schedule doesn't exist
2022-12-12 17:31:57 +05:30
anandbaburajan
b997d1eb87
chore: add some validation, shorten some function names
2022-12-12 17:25:38 +05:30
Anand Baburajan
f8cd424559
Merge branch 'develop' into asset_depreciation_schedule
2022-12-12 16:36:59 +05:30
anandbaburajan
ec6505d747
chore: fix some bugs, refactor some functions, add proper notes
2022-12-12 16:35:30 +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
artykbasar
d512919f5c
Subscription Cost center value is fixed to Default value(Bug fix)
...
self.cost_center
field value keeps changing to
erpnext.get_default_cost_center(self.get("company"))
after validation of this doctype. This overrides the user input.
simple fix, it will first check if the field is empty, if empty then puts the company's default cost center value if not then user input will be saved.
2022-12-11 08:51:34 +00:00
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
anandbaburajan
90e1b9cb3d
chore: fix asset depr schedule notes
2022-12-09 16:18:40 +05:30
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
anandbaburajan
16365bfca3
chore: more refactoring
2022-12-09 14:04:00 +05:30
Devin Slauenwhite
2010b1b6e8
fix: use highest precision for exchange rate.
2022-12-08 16:26:07 -05:00
anandbaburajan
77dc8e7966
fix: bug in posting depr entries
2022-12-09 00:58:19 +05:30
anandbaburajan
187e1a324a
chore: refactor get_depreciable_assets
2022-12-09 00:46:56 +05:30
anandbaburajan
1fd73af744
chore: refactor some reports
2022-12-09 00:28:34 +05:30
Deepesh Garg
7d41f63c5d
Merge pull request #33200 from deepeshgarg007/buying_selling_pricing_rule
...
fix: Buying and selling check in pricing rule
2022-12-08 18:41:42 +05:30
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
sonali
8e7c8a6482
Update bank_reconciliation_tool.json
...
Adding fields in bank reconciliation tool
2022-12-08 17:23:08 +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
sonali
447272aa4d
Filters on Bank Reconciliation
...
Applying date filter on transactions and all the bank entries and also gives the filter the bank entries as per reference date. Sorted all transactions and entries as per date in ascending order. Also added posting date columns in all bank entries and default checkbox tick of journal entry, hide the sales invoice and purchase invoice checkbox.
2022-12-08 16:11:53 +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
sonali
e5a1189bec
Update bank_reconciliation_tool.py
...
Applying date filter on transactions and all the bank entries and also gives the filter the bank entries as per reference date. Sorted all transactions and entries as per date in ascending order.
Also added posting date columns in all bank entries and default checkbox tick of journal entry, hide the sales invoice and purchase invoice checkbox.
2022-12-08 13:29:28 +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
rohitwaghchaure
e451639ff6
Merge pull request #33258 from rohitwaghchaure/fixed-total-value-in-report
...
fix: total value in Warehouse Wise Stock Balance
2022-12-08 10:13:03 +05:30
Rohit Waghchaure
f598da7c81
fix: total value in Warehouse Wise Stock Balance
2022-12-08 00:55:45 +05:30
rohitwaghchaure
5e0f4eb580
Merge pull request #33255 from s-aga-r/fix/github-issue/33212
...
fix: order status in `Production Planning Report`
2022-12-07 23:36:12 +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
anandbaburajan
18fc2b5695
chore: fix bug in unlink_asset_reference
2022-12-06 23:34:56 +05:30
anandbaburajan
2cd42dbb10
chore: refactor get_finance_book_value_map
2022-12-06 23:16:02 +05:30
anandbaburajan
e7d404a30a
chore: remove finance_book and finance_book_id from depreciation_schedule and refactor some functions
2022-12-06 21:33:20 +05:30
anandbaburajan
8365d6bdb7
fix: refactor reverse_depreciation_entry_made_after_disposal and fix fb bug
2022-12-06 17:58:38 +05:30
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
