Sagar Sharma
88edc412e3
Merge branch 'develop' into fix/purchase-order/shipping_address
2022-12-26 12:00:39 +05:30
s-aga-r
67a7ccf3ce
fix: shipping_address for non-drop shipping item
2022-12-26 11:57:50 +05:30
Deepesh Garg
8a79efab4b
feat: Accounting Dimension updation in Payment Request and Entry ( #33411 )
2022-12-26 10:17:55 +05:30
Solufyin
7d9f3f23dd
fix: Customer Primary Contact ( #33424 )
...
Co-authored-by: Nihantra C. Patel <n.patel.serpentcs@gmail.com>
2022-12-26 10:15:10 +05:30
Sagar Sharma
32f3b64a89
Merge branch 'develop' into fix/github-issue/32258
2022-12-25 18:12:08 +05:30
s-aga-r
7e1b6b3c2a
fix: shipping_address in PO
2022-12-25 18:11:05 +05:30
anandbaburajan
03662be150
chore: have different functions for draft. active and cancelled depr schedules
2022-12-25 18:05:19 +05:30
ruthra kumar
a0484793c3
refactor: remove unrelated filters from Supplier Ledger Summary
...
Territory, Sales Partner and Sales Person doesn't belong in Supplier Ledger
2022-12-24 11:20:39 +05:30
ruthra kumar
89229d9b58
refactor: additional doctype access for 'Accounts User' role
2022-12-24 11:20:16 +05:30
ruthra kumar
bfa511cb65
refactor: hidden columns to help framework handle user permissions
...
'territory', 'supplier_group', 'customer_group' have been added as
hidden columns to handle 'user permission' based access control.
2022-12-24 10:30:30 +05:30
rohitwaghchaure
40769998c6
Merge pull request #33422 from rohitwaghchaure/fix-stock-entry-submit-performance
...
fix: timeout error while submitting stock entry
2022-12-23 13:57:25 +05:30
Rohit Waghchaure
a05c47e499
fix: timeout error while submitting stock entry
...
Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-12-23 13:27:32 +05:30
Anand Baburajan
b17ef34042
Merge branch 'develop' into asset_depreciation_schedule
2022-12-23 11:02:17 +05:30
anandbaburajan
3e91a56c19
chore: only consider draft and active assets in patch, and allow asset depr schedule to be manually createed
2022-12-23 11:01:18 +05:30
ruthra kumar
8f5d8e0474
Merge pull request #33418 from ruthra-kumar/filter_issue_in_ar_ap_report
...
fix: payment terms and sales partner filter issue in Accounts Receivable report
2022-12-22 11:38:38 +05:30
ruthra kumar
13c4420f42
fix: payment terms and sales partner filter issue in AR/AP report
2022-12-22 10:55:22 +05:30
ruthra kumar
a26698b88e
Merge pull request #33410 from ruthra-kumar/typeerror_on_gp_due_to_incorrect_warehouse_on_bundle_item
...
fix: TypeError on GP Report due to multiple warehouse on bundled items
2022-12-21 18:26:40 +05:30
ruthra kumar
5918bb03f7
test: type error on bundled products with different warehouses
2022-12-21 17:47:57 +05:30
ruthra kumar
e684eb32d0
fix: typerror on multi warehouse in Packed Items
...
DN(with bundled item with varying warehouses)-> Sales Invoice.
2022-12-21 15:09:55 +05:30
sonali
81e5f71172
fix: json issue
2022-12-21 14:02:54 +05:30
sonali
6b5276398e
fix: linters
2022-12-21 13:32:16 +05:30
sonali
645869e6ff
feat: added arguments of posting date and reference date
2022-12-21 12:58:30 +05:30
Deepesh Garg
ade83cbab3
fix: Consolidated financial report
2022-12-20 16:45:46 +05:30
Deepesh Garg
1da14b7ec3
Merge pull request #33393 from deepeshgarg007/cc_filter_cashflow_report
...
fix: Cost center filter not working in cash flow report
2022-12-20 13:46:18 +05:30
Deepesh Garg
925387550e
Merge pull request #33350 from deepeshgarg007/payment_request_flow
...
fix: Payment Request flow fixes from Order to Payment Entry
2022-12-20 13:45:15 +05:30
Deepesh Garg
9dc1509cf5
Merge pull request #33358 from resilient-tech/fix-appointment-booking
...
fix: remove unnecessary permissions from Appointment and Appointment Booking Settings
2022-12-20 11:53:01 +05:30
Deepesh Garg
31c95deb88
chore: More fixes
2022-12-20 11:45:51 +05:30
Deepesh Garg
ff48634cbb
Merge branch 'develop' of https://github.com/frappe/erpnext into payment_request_flow
2022-12-20 11:42:15 +05:30
Deepesh Garg
e25b98b620
chore: Update test case
2022-12-20 11:42:05 +05:30
Deepesh Garg
068df9f815
chore: remove print statement
2022-12-20 10:00:53 +05:30
Deepesh Garg
d0dbfec052
fix: Cost center filter not working in cash flow report
2022-12-20 09:59:27 +05:30
rohitwaghchaure
1ed2230e4c
Merge pull request #33382 from rohitwaghchaure/fixed-pick-list-issue
...
fix: unsupported operand type(s) for +=: 'int' and 'NoneType'
2022-12-20 09:47:29 +05:30
rohitwaghchaure
eaa04abe29
Merge pull request #33387 from rohitwaghchaure/audit-to-fix-incorrect-valuation-entry
...
fix: daily scheduler to identify and fix stock transfer entries having incorrect valuation
2022-12-20 09:46:57 +05:30
Rohit Waghchaure
f31612376a
test: added test case to validate audit for incorrect entries
2022-12-20 00:14:41 +05:30
Rohit Waghchaure
b1721b79ce
fix: daily scheduler to identify and fix stock transfer entries having incorrect valuation
2022-12-19 23:33:44 +05:30
rohitwaghchaure
7851adb49a
Merge branch 'develop' into fixed-pick-list-issue
2022-12-19 23:32:06 +05:30
Ankush Menat
88ce11f03d
fix: incorrect type hints ( #33381 )
...
[skip ci]
2022-12-19 16:44:19 +05:30
Rohit Waghchaure
2b4eae5f84
fix: unsupported operand type(s) for +=: 'int' and 'NoneType'
2022-12-19 16:24:55 +05:30
ruthra kumar
65db9cea25
Merge pull request #33380 from ruthra-kumar/err_for_invoices_should_reflect_in_ar_ap_report
...
fix: ERR journals should reported in AR/AP
2022-12-18 16:56:19 +05:30
ruthra kumar
2ed86760d7
test: err for party should be in AR/AP report
2022-12-18 12:40:07 +05:30
ruthra kumar
b09eade3e4
fix: ERR journals reported in AR/AP
...
Exchange Rate Revaluation on Receivable/Payable will included in AR/AP report
2022-12-18 06:38:23 +05:30
Gokulnath
4ecce242a8
feat: adding warehouse filter for sales order ananlysis report
...
feat: adding warehouse filter for sales order ananlysis report
2022-12-17 20:06:01 +05:30
Deepesh Garg
67c5cec505
Merge pull request #33339 from barredterra/print-rfq
...
feat: more control when printing RFQ
2022-12-17 19:24:57 +05:30
Deepesh Garg
6238fd9d9e
Merge pull request #33341 from deepeshgarg007/tds_tcs_cost_center
...
fix: Cost Center for tax withholding invoices
2022-12-17 19:24:34 +05:30
sonali
05b6fce03d
feat:filters on bank reconciliation
...
Added date filters on bank transactions, payment entries and journal entries and sorted list as per date in ascending order.
2022-12-17 17:15:28 +05:30
Deepesh Garg
2a4eec245a
Merge pull request #33371 from deepeshgarg007/coa_import_srbnb
...
fix: Unable to import COA through importer
2022-12-17 16:42:37 +05:30
Deepesh Garg
3b66920342
fix: Unable to import COA through importer
2022-12-16 19:22:29 +05:30
Deepesh Garg
0e86cde64b
Merge branch 'develop' into print-rfq
2022-12-16 16:24:02 +05:30
Sagar Vora
9989ccbb02
Merge branch 'develop' into fix-appointment-booking
2022-12-16 10:36:48 +00:00
Daizy Modi
4802d719ed
fix: removed unused data and minor changes
2022-12-16 15:55:58 +05:30
Deepesh Garg
6bb22c703a
Merge pull request #33275 from pps190/fix-pe-exchange-rate-precision
...
fix: use highest precision for exchange rate.
2022-12-16 15:43:36 +05:30
Deepesh Garg
50421b3d7d
Merge pull request #33315 from kunhimohamed/develop
...
fix: at create_customer_or_supplier on session creation
2022-12-16 15:04:10 +05:30
Deepesh Garg
b76129c1dd
Merge pull request #33286 from artykbasar/develop
...
Subscription Cost center value is fixed to Default value(Bug fix)
2022-12-16 14:44:51 +05:30
Deepesh Garg
5c50a46822
Merge pull request #33362 from deepeshgarg007/exclude_gst_credential_doctype
...
feat: Ignore company related doctype for other apps via hooks
2022-12-16 11:07:47 +05:30
Daizy Modi
5d0b5c8d2a
fix: pass necessary params instead of args
2022-12-16 10:10:29 +05:30
Deepesh Garg
1a40c04b72
feat: Ignore company related doctype for other apps via hooks
2022-12-15 18:51:58 +05:30
sonali
408c89df03
Feat:Filter on Payment Entries and Journal Entries
...
Applying filters on Payement entries and Journal Entries as per reference date and posting date
2022-12-15 18:09:57 +05:30
rohitwaghchaure
da1d8da355
Merge pull request #33355 from rohitwaghchaure/fixed-do-not-show-disabled-items
...
fix: disabled items showing in the report Itemwise Recommended Reorder Level
2022-12-15 18:08:05 +05:30
Daizy Modi
56f3ac15d8
fix: removed unncessary changes
2022-12-15 18:02:14 +05:30
Daizy Modi
4bfe2ea572
fix: agent assignment and permissions for appointment
2022-12-15 17:19:28 +05:30
rohitwaghchaure
5cbbb5d59e
Merge pull request #33354 from rohitwaghchaure/fixed-trivial-discount-amount
...
fix: unsupported operand type(s) for +: 'int' and 'NoneType'
2022-12-15 17:13:46 +05:30
Rohit Waghchaure
ae31ff1c48
fix: disabled items showing in the report 'Itemwise Recommended Reorder Level
...
'
2022-12-15 17:05:53 +05:30
Daizy Modi
ac51c27500
fix: fetch required details from appointment booking settings
2022-12-15 16:53:51 +05:30
Daizy Modi
9a00b3bdbd
fix: format html of verify email for book appointment
2022-12-15 16:51:00 +05:30
Daizy Modi
25f0b26a17
fix: remove unused page book-appointment
2022-12-15 16:49:23 +05:30
Daizy Modi
ae8dd2b2bc
fix: remove guest role from doctype
2022-12-15 16:47:27 +05:30
Rohit Waghchaure
0f28074e5a
fix: unsupported operand type(s) for +: 'int' and 'NoneType'
2022-12-15 16:36:47 +05:30
ruthra kumar
d126c8030f
Merge pull request #33335 from ruthra-kumar/cost_center_issue_on_reconciliation_tool
...
fix: paid invoices shows up as outstanding when 'cost_center' filter is applied
2022-12-15 15:02:18 +05:30
Anand Baburajan
246d3b4075
Merge branch 'develop' into asset_depreciation_schedule
2022-12-15 14:51:16 +05:30
anandbaburajan
a358f77774
chore: move patch to post_model_sync and cancel asset depr schedule properly
2022-12-15 14:50:53 +05:30
ruthra kumar
a998a8a2da
test: cost center should not affect outstanding calculation
2022-12-15 14:28:33 +05:30
Deepesh Garg
dc178984ae
fix: Payment Request flow fixes from Order to Payment Entry
2022-12-15 14:15:20 +05:30
anandbaburajan
7f5e761c04
chore: add patch
2022-12-15 13:13:04 +05:30
Deepesh Garg
3a8a467edb
Merge pull request #33329 from Gokulnath17/Gokulnath_dev
...
fix: in gross profit report
2022-12-15 12:01:39 +05:30
Deepesh Garg
076527bb88
Merge pull request #33305 from barredterra/incoterm-named-place
...
feat: incoterm named place
2022-12-15 11:59:54 +05:30
Gokulnath
f73976946e
Merge branch 'develop' into Gokulnath_dev
2022-12-15 10:22:49 +05:30
Deepesh Garg
b7e9942681
Merge pull request #33309 from barredterra/refactor-validate_payment_against_negative_invoice
...
refactor: translatable strings and guard clause
2022-12-15 09:21:16 +05:30
rohitwaghchaure
9bf2682218
Merge pull request #33323 from barredterra/translate-overbilling-overdelivery
...
fix: translatability of warning on overbilling/-receipt/-delivery
2022-12-14 23:24:11 +05:30
Deepesh Garg
26277cfcf3
chore: resolve errors in test
2022-12-14 21:22:48 +05:30
Deepesh Garg
973ef33eb5
fix: Cost Center for tax withholding invoices
2022-12-14 20:41:00 +05:30
barredterra
8717148d9b
feat: improve visibility of default values
2022-12-14 14:14:29 +01:00
barredterra
ce9626fead
feat: more control when printing RFQ
2022-12-14 14:03:36 +01:00
Gokulnath
d404a03947
Merge branch 'develop' into Gokulnath_dev
2022-12-14 17:38:16 +05:30
ruthra kumar
8eb93004f7
fix: cost_center filter fix for 'Get Outstanding Invoice' in PE
2022-12-14 16:16:22 +05:30
rohitwaghchaure
21c86bd649
Merge pull request #33332 from rohitwaghchaure/fixed--missing-required-argument
...
fix: get_serial_nos_for_fg() missing 1 required positional argument: …
2022-12-14 16:06:58 +05:30
ruthra kumar
6d9d730759
fix: cost_center filter gives incorrect output
...
filtering on cost center gives invoices that are reconciled as having outstanding
2022-12-14 16:05:15 +05:30
Rohit Waghchaure
410a58b3de
fix: get_serial_nos_for_fg() missing 1 required positional argument: 'args'
2022-12-14 15:33:36 +05:30
anandbaburajan
c99cd74a15
chore: handle some error cases and add empty patch file
2022-12-14 13:20:37 +05:30
Gokulnath17
41fc3be339
fixes in gross profit report
2022-12-14 10:46:11 +05:30
barredterra
36997d9788
fix: translation for warning on Overbilling/-receipt/-delivery
2022-12-13 18:59:20 +01:00
Anand Baburajan
8534390627
Merge branch 'develop' into asset_depreciation_schedule
2022-12-13 20:49:06 +05:30
anandbaburajan
22ef342ac7
chore: fixing all tests
2022-12-13 20:48:34 +05:30
anandbaburajan
df134c7c5b
chore: fixing some tests
2022-12-13 16:26:33 +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
kunhi
15e3b7f218
fix: at create_customer_or_supplier on session creation
2022-12-13 12:41:56 +04:00
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
barredterra
f20370c5ef
refactor: translatable strings and guard clause
2022-12-13 02:36:12 +01:00
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
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
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
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
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
Raffael Meyer
a2abc879c9
Merge branch 'develop' into validate-project-dates
2022-12-05 19:37:46 +01:00
barredterra
748c74ba52
fix: add translation variable order
2022-12-05 18:24:22 +01:00
rohitwaghchaure
d0478ec3b8
Merge pull request #33224 from rohitwaghchaure/fixed-partial-work-order-incorrect-batch-picked
...
fix: non empty FG batch picked while completing work order
2022-12-05 20:29:19 +05:30
Rohit Waghchaure
713330cbf6
fix: non empty FG batch picked while completing work order
2022-12-05 18:15:13 +05:30
Deepesh Garg
0581000990
fix: Remove free items
2022-12-05 17:59:02 +05:30
ruthra kumar
7bd0e977bf
Merge pull request #33222 from ruthra-kumar/data_import_errors_for_sales_invoice
...
fix: data import mandatory account_head, charge_type
2022-12-05 16:56:43 +05:30
ruthra kumar
3814db02eb
fix: data import mandatory account_head, charge_type
2022-12-05 16:24:05 +05:30
Deepesh Garg
55c0770280
Merge branch 'develop' of https://github.com/frappe/erpnext into buying_selling_pricing_rule
2022-12-05 15:43:29 +05:30
Deepesh Garg
5f821b93a5
chore: Add POS Invoices
2022-12-05 15:43:03 +05:30
Deepesh Garg
ef9d126254
fix: Allow item rate udpates for non-stock invoices
2022-12-05 10:17:19 +05:30
anandbaburajan
83ed93fbb6
chore: refactor chart and manual set_accumulated_depreciation logic
2022-12-04 22:45:48 +05:30
barredterra
31db0e7c79
refactor: validate parent_expected_end_date in Task
2022-12-04 15:28:38 +01:00
barredterra
2c4eb371a6
refactor: validate dates in project and task
2022-12-04 15:15:07 +01:00
anandbaburajan
ca8c827492
chore: refactor schedules in split_asset functions
2022-12-04 19:22:58 +05:30
barredterra
eb66b749b2
refactor: validate dates in accounts module
2022-12-04 14:41:21 +01:00
Raffael Meyer
083a954b5d
Merge branch 'develop' into validate-employee-dates
2022-12-04 14:30:51 +01:00
Deepesh Garg
b741ae143c
fix: Reapply pricing rule on qty change
2022-12-02 17:14:06 +05:30
rohitwaghchaure
66dbf94151
Merge pull request #33199 from s-aga-r/refactor/warehouse-tree
...
refactor: remove `balance` from `Warehouse Tree`
2022-12-02 14:24:07 +05:30
rohitwaghchaure
295ce0e8e9
Merge pull request #33193 from rohitwaghchaure/clear-repost-logs
...
fix: clear repost logs using Log Settings
2022-12-02 13:55:59 +05:30
Rohit Waghchaure
2cce6f2a34
fix: test case
2022-12-02 12:43:31 +05:30
Sagar Sharma
b3ae6cc4b9
Merge branch 'develop' into refactor/warehouse-tree
2022-12-02 10:58:33 +05:30
Deepesh Garg
2058fac177
Merge pull request #33195 from ruthra-kumar/type_error_on_sales_pipeline_report
...
fix: type error on Sales Pipeline Analytics
2022-12-02 10:10:36 +05:30
Rohit Waghchaure
5949a7ecff
fix: default clear repost logs
2022-12-01 23:35:21 +05:30
Deepesh Garg
f54838ab56
fix: Buying and selling check in pricing rule
2022-12-01 21:23:17 +05:30
s-aga-r
3ce8386ca3
refactor: remove balance from Warehouse Tree
2022-12-01 19:44:49 +05:30
Deepesh Garg
2106de0fa5
Merge pull request #33170 from deepeshgarg007/se_alert_develop
...
fix(UX): Alert on change of item rate in Stock Entry
2022-12-01 18:16:55 +05:30
Deepesh Garg
9ddd838f2d
Merge pull request #33183 from deepeshgarg007/month_end_due_date
...
fix: Due date for month end payment term
2022-12-01 18:16:13 +05:30
ruthra kumar
4856e750f9
fix: type error on Sales Pipeline Analytics
2022-12-01 18:08:32 +05:30
barredterra
03f7bfbbde
refactor: validate dates
2022-12-01 12:42:03 +01:00
Deepesh Garg
826f45ad60
fix: Bundle item rates
2022-12-01 16:11:10 +05:30
anandbaburajan
f20238fa3e
chore: use make_new_active_asset_depr_schedules_and_cancel_current_ones instead of prepare_depreciation_data
2022-12-01 15:15:32 +05:30
ruthra kumar
9b8d6fe411
fix: key error while filtering on date range and different currency
2022-12-01 13:38:41 +05:30
Anand Baburajan
5b1743330d
Merge branch 'develop' into invalid_message_fix
2022-12-01 12:35:04 +05:30
Anand Baburajan
2886d8ab5a
Merge branch 'develop' into month_end_due_date
2022-12-01 12:34:51 +05:30
Deepesh Garg
5b1798363c
Merge pull request #33091 from ssiyad/fix/pos/partial_return_amount
...
fix(pos): partial return amount update
2022-12-01 11:41:53 +05:30
Sagar Sharma
d892e27289
Merge branch 'develop' into se_alert_develop
2022-12-01 10:37:52 +05:30
