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
Sagar Sharma
93f29d8f08
Merge branch 'develop' into invalid_message_fix
2022-12-01 09:24:40 +05:30
anandbaburajan
827ad01d4f
chore: style
2022-11-30 23:57:26 +05:30
Anand Baburajan
ba38001116
Merge branch 'develop' into asset_last_day_test_bug
2022-11-30 23:53:21 +05:30
anandbaburajan
25522444b8
fix: use is_last_day_of_the_month in test_scrap_asset
2022-11-30 23:25:40 +05:30
Sagar Sharma
0e8edd1ee9
Merge branch 'develop' into se_alert_develop
2022-11-30 22:03:31 +05:30
Deepesh Garg
bfb81ef56f
fix: Due date for month end payment term
2022-11-30 20:53:41 +05:30
Deepesh Garg
64e5a79a91
fix: Error on making stock entry from material request
2022-11-30 19:35:30 +05:30
Sabu Siyad
c5edbe2e2f
fix(lint): trailing whitespace
...
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
2022-11-30 17:12:06 +05:30
Sagar Sharma
43d08b4c74
Merge branch 'develop' into se_alert_develop
2022-11-30 10:15:31 +05:30
s-aga-r
ca0485a503
fix: add company filter in RFQ Items
2022-11-30 10:03:36 +05:30
anandbaburajan
96ede2fcf9
fix: bug in new depr schedule
2022-11-29 21:30:23 +05:30
Deepesh Garg
4bd9289d7d
fix(UX): Alert on change of item rate in Stock Entry
2022-11-29 19:21:48 +05:30
Deepesh Garg
3eb1ed19a1
fix: Tax withholding net total for PI in reports
2022-11-29 13:10:31 +05:30
Sagar Sharma
ce7720b14c
Merge branch 'develop' into repost-item-valuation
2022-11-29 11:03:22 +05:30
rohitwaghchaure
6dd84cb977
Merge pull request #33013 from rtdany10/riv-validation
...
fix: validate repost item valuation against accounts freeze date
2022-11-29 10:40:48 +05:30
Deepesh Garg
a7b7d0d99d
Merge pull request #33116 from shariquerik/show-batch-selector-only-once
...
fix: only show serial no batch selector only once
2022-11-29 10:20:30 +05:30
Deepesh Garg
8253f4379f
Merge pull request #33098 from ssiyad/fix/pos/warehouse_selection
...
fix(pos): warehouse selection
2022-11-29 10:15:31 +05:30
Deepesh Garg
56b96f0a9c
Merge branch 'develop' into fix/pos/partial_return_amount
2022-11-29 10:12:29 +05:30
Deepesh Garg
bdb15c3331
Merge pull request #33112 from ssiyad/fix/pos/customer_group_filter
...
fix(pos): filter on customer groups
2022-11-29 09:55:56 +05:30
Deepesh Garg
8287fb5104
Merge pull request #33143 from deepeshgarg007/auto_repeat_dates
...
fix: Auto repeat date validations
2022-11-29 09:28:19 +05:30
Deepesh Garg
8112493c3c
Merge pull request #33138 from deepeshgarg007/bank_reco_button_fix
...
fix(ux): Action buttons in Bank Reconciliation
2022-11-29 09:23:21 +05:30
rohitwaghchaure
a222b0a6ae
Merge pull request #33144 from rohitwaghchaure/fixed-incorrect-stock-balance-qty
...
fix: incorrect balance qty
2022-11-29 08:48:03 +05:30
barredterra
06e094b5fc
fix: reload currency exchange settings
2022-11-28 22:58:31 +01:00
Rohit Waghchaure
b606a9684b
test: test case for serialized batched item
2022-11-29 00:08:07 +05:30
Rohit Waghchaure
b2105a8be7
fix: incorrect balance qty
2022-11-28 23:13:30 +05:30
Deepesh Garg
6a47fb6c9e
chore: Update condition
2022-11-28 22:47:44 +05:30
Sagar Sharma
4750bfaeab
Merge branch 'develop' into repost-item-valuation
2022-11-28 22:06:49 +05:30
Deepesh Garg
a9cf9e5a88
Merge pull request #33107 from barredterra/german-tax-templates
...
feat: german tax templates
2022-11-28 21:54:08 +05:30
Sagar Sharma
ec95a9b760
Merge branch 'develop' into repost-item-valuation
2022-11-28 21:33:58 +05:30
Sagar Sharma
8948e42a6d
Merge branch 'develop' into repost-item-valuation
2022-11-28 21:29:35 +05:30
s-aga-r
4e10352b48
chore: make posting_date and posting_time read-only if based_on is set to Transaction
2022-11-28 21:22:22 +05:30
s-aga-r
eeec008547
fix: reset voucher_type and voucher_no if based_on is set to Item and Warehouse
2022-11-28 21:22:20 +05:30
Sagar Sharma
6868b4d7c3
Merge branch 'develop' into fix/repost-item-valuation
2022-11-28 21:00:46 +05:30
s-aga-r
eeda264eb6
fix: reposting error AttributeError: 'datetime.timedelta' object has no attribute 'replace'
2022-11-28 20:59:14 +05:30
Deepesh Garg
fa15221455
fix: Auto repeat date validations
2022-11-28 19:22:35 +05:30
s-aga-r
ba77da0874
fix: validation msg in stock entry
2022-11-28 18:01:30 +05:30
Deepesh Garg
6ebe8ad60d
fix(ux): Action buttons in Bank Reconciliation
2022-11-28 17:37:41 +05:30
rohitwaghchaure
b8b9d1b0a8
Merge pull request #33135 from rohitwaghchaure/feat-provision-to-make-mr-for-sub-assembly-items
...
feat: make Material Request for sub-assembly items
2022-11-28 16:53:38 +05:30
Rohit Waghchaure
e02f35c8ff
feat: make Material Request for sub-assembly items
2022-11-28 16:20:46 +05:30
ruthra kumar
9fd70a6827
Merge pull request #33115 from ruthra-kumar/duplicate_schema_block
...
fix: remove product schema block from additional info section on item template
2022-11-28 15:28:50 +05:30
Deepesh Garg
f6126069ee
Merge pull request #33129 from deepeshgarg007/accounts_settings_fix
...
chore: Supplier invoice no field description
2022-11-28 13:05:12 +05:30
Ankush Menat
63b9795d41
fix: opportunity list doesn't show assigned user ( #33110 )
...
Because `db_update` is performed `_assign` property is not updated and
hence lead -> opportunity conversion makes it disappear from list view.
Steps to reproduce:
1. Create lead
2. Assign anyone
3. Create opportunity from lead.
4. Form view shows assigned user, list view wont.
2022-11-28 10:58:35 +05:30
Deepesh Garg
4f2ece34df
chore: Supplier invoice no field description
2022-11-27 21:50:26 +05:30
Deepesh Garg
dedd722aef
Merge pull request #33022 from barredterra/incoterms
...
feat: Incoterms in buying and selling
2022-11-27 20:52:25 +05:30
rohitwaghchaure
397a0e2a3a
Merge pull request #33118 from rohitwaghchaure/production-plan-ux-issues
...
fix: production plan UX
2022-11-27 08:46:39 +05:30
s-aga-r
ef7fd670fc
fix: production_item filter in Job Card Summary Report
2022-11-26 16:57:38 +05:30
s-aga-r
481149814e
fix: company name with , in Job Card Summary Report
2022-11-26 16:55:45 +05:30
s-aga-r
2e4f3e9317
fix: Work Order filter typo in Job Card Summary Report
2022-11-26 16:54:53 +05:30
s-aga-r
87b39f045c
fix: company name with , in Work Order Summary Report
2022-11-26 16:39:32 +05:30
Rohit Waghchaure
8cb7112e72
fix: production plan UX
2022-11-26 15:02:27 +05:30
Sagar Sharma
10a2121361
Merge branch 'develop' into show-batch-selector-only-once
2022-11-26 10:09:10 +05:30
Raffael Meyer
905a50cbb2
Merge branch 'develop' into incoterms
2022-11-25 16:50:55 +01:00
Shariq Ansari
0f87d329d6
fix: only show serial no batch selector only once
2022-11-25 17:03:00 +05:30
anandbaburajan
7d09440579
chore: more refactoring
2022-11-25 16:49:44 +05:30
ruthra kumar
2c18a95115
fix: remove duplicate schema
2022-11-25 16:23:45 +05:30
Sabu Siyad
cc63415887
fix(pos): filter on customer groups
...
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
2022-11-25 15:10:01 +05:30
Abhinav Raut
fe87c27acd
fix: disbursable amount on currrent security price
2022-11-25 13:20:01 +05:30
barredterra
7fd2639e68
feat: german tax templates
2022-11-25 00:21:33 +01:00
Sagar Sharma
4e7613d4ce
Merge branch 'develop' into fix/github-issue/20496
2022-11-24 20:43:52 +05:30
s-aga-r
df0fee2312
fix: MR Item description and item_name gets reset on qty change
2022-11-24 20:42:57 +05:30
rohitwaghchaure
b0c8643517
Merge pull request #33103 from rohitwaghchaure/fixed-job-card-for-qty-ux
...
fix: job card "Qty to Manufacture" UX
2022-11-24 19:24:05 +05:30
Deepesh Garg
541eb7e43b
Merge pull request #33100 from deepeshgarg007/dispatch_address_display
...
fix: Dispatch address display
2022-11-24 18:00:26 +05:30
anandbaburajan
4e63ba3ac6
chore: refactor schedules in journal_entry
2022-11-24 17:39:11 +05:30
Rohit Waghchaure
87d37e90a2
fix: job card for quantity UX
2022-11-24 17:29:50 +05:30
Deepesh Garg
104fdcb9f9
fix: Dispatch address display
2022-11-24 16:41:40 +05:30
Sabu Siyad
80813c66e3
Merge branch 'develop' into fix/pos/warehouse_selection
2022-11-24 16:21:54 +05:30
anandbaburajan
de17367a36
chore: finish refactoring asset_value_adjustment
2022-11-24 16:16:36 +05:30
Sabu Siyad
4ad0e2ed7e
feat(pos): invoice: fitler warehouse by company
...
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
2022-11-24 16:11:26 +05:30
Sabu Siyad
95a620a30d
fix(pos): warehouse should be in company
...
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
2022-11-24 15:40:05 +05:30
anandbaburajan
0e726609f1
fix: precision in asset test_scrap_asset
2022-11-24 15:38:05 +05:30
anandbaburajan
f35b19eac3
chore: renaming functions and variables again, and continuing refactoring AssetValueAdjustment
2022-11-24 15:33:21 +05:30
Deepesh Garg
3724f2287c
Merge pull request #33092 from deepeshgarg007/debit_credit_issue
...
fix: Debit and Credit not equal while submitting PI containing asset item
2022-11-24 14:42:56 +05:30
anandbaburajan
7db66b0916
chore: renaming some functions and variables, and partially refactoring AssetValueAdjustment
2022-11-24 13:02:48 +05:30
Deepesh Garg
dc8d635120
fix: Debit and Credit not equal while submitting PI containing asset item
2022-11-23 20:29:12 +05:30
Dany Robert
88a0aa4077
chore: pre-commit
2022-11-23 19:04:11 +05:30
Dany Robert
b482e3876d
fix: check for session user rather than owner
2022-11-23 18:59:15 +05:30
Deepesh Garg
60740baf3b
Merge pull request #33066 from deepeshgarg007/move_taxjar_integration_new
...
refactor!: Move TaxJar integration from ERPNext
2022-11-23 18:21:55 +05:30
Deepesh Garg
7a7b8c2284
Merge pull request #32836 from resilient-tech/perf-fix-get-cached-value-for-accounts
...
perf: use `get_cached_value` instead of `db.get_value` in accounts module
2022-11-23 18:20:48 +05:30
Saurabh
5e4a287624
Merge pull request #33065 from saurabh6790/task-view-fix
...
fix: project website view
2022-11-23 18:17:55 +05:30
anandbaburajan
76f28de7eb
chore: refactor more functions to use new depr schedule
2022-11-23 18:04:54 +05:30
Sabu Siyad
a378619c9a
fix(pos): partial return amount update
...
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
2022-11-23 17:52:12 +05:30
Deepesh Garg
0e3438db10
Merge branch 'develop' of https://github.com/frappe/erpnext into move_taxjar_integration_new
2022-11-23 17:47:22 +05:30
Deepesh Garg
f448a077b8
chore: Cleanup patches
2022-11-23 17:47:05 +05:30
Rohit Waghchaure
be19e4f621
fix: Valuation Rate column UX in stock ledger report
2022-11-23 16:44:18 +05:30
Deepesh Garg
a3c81da890
Merge pull request #33062 from nabinhait/pcv-rounding-issue
...
fix: create rounding gl entry for PCV during gle post processing
2022-11-23 10:36:04 +05:30
rohitwaghchaure
68424887e4
Merge pull request #33077 from rohitwaghchaure/ux-for-inventory-dimension
...
fix: UX for inventory dimension
2022-11-23 09:53:49 +05:30
Deepesh Garg
06c9c679e6
Merge pull request #33063 from niralisatapara/tds_purchase_order
...
feat: item wise tds in purchase order
2022-11-23 09:52:00 +05:30
Deepesh Garg
34e775136d
Merge pull request #33069 from deepeshgarg007/jv_filter
...
fix: Remove unnecessary filters from Journal Entry
2022-11-22 20:15:12 +05:30
Deepesh Garg
eb74362263
Merge pull request #33068 from deepeshgarg007/payment_button_visibility
...
fix: Don't show payment button for invoices on hold
2022-11-22 20:14:41 +05:30
Deepesh Garg
0fffe61e3c
Merge pull request #33072 from deepeshgarg007/move_section
...
chore: Rearrange supplier invoice section in Purchase Invoice
2022-11-22 20:14:14 +05:30
niralisatapara
0fdde2e5c0
feat: item wise tds calculation for purchase order
2022-11-22 14:36:30 +05:30
niralisatapara
46e8cdf31a
feat: item wise tds calculation for purchase order.
2022-11-22 14:15:36 +05:30
ruthra kumar
31f463dd83
Merge pull request #33071 from ruthra-kumar/advance_paid_in_account_currency
...
fix: advance paid updated in account currency for SO/PO
2022-11-22 13:45:04 +05:30
Deepesh Garg
e96be712b8
chore: Rearrange supplier invoice section in Purchase Invoice
2022-11-22 12:50:00 +05:30
ruthra kumar
541cf153f7
test: fix test case for SO/PO advance amount
2022-11-22 12:33:29 +05:30
ruthra kumar
bf76b85dfd
fix: update advace paid in SO/PO in account currency
2022-11-22 12:33:18 +05:30
Deepesh Garg
cd88a53533
fix: Remove unnecessary filters from Journal Entry
2022-11-21 22:21:03 +05:30
Deepesh Garg
1b9e83251f
fix: Don't show payment button for invoices on hold
2022-11-21 21:50:55 +05:30
Deepesh Garg
81c856ccb8
chore: Remove unwanted patch
2022-11-21 21:00:31 +05:30
Deepesh Garg
1100816d7a
refactor!: Move TaxJar integration from ERPNext
2022-11-21 20:18:06 +05:30
Saurabh
5d9960ae5b
feat: handle empty state
2022-11-21 19:37:57 +05:30
Saurabh
80e45828ae
fix: ux for project view on web
2022-11-21 18:16:57 +05:30
Saurabh
7cc99ab63b
fix: update tasks route under website route rules
2022-11-21 18:13:54 +05:30
niralisatapara
b9d0b4e2d3
feat: item wise tds in purchase order
2022-11-21 15:43:03 +05:30
Nabin Hait
022d8d5d79
fix: create rounding gl entry for PCV during gle post processing
2022-11-21 15:16:53 +05:30
Deepesh Garg
e25d0ead1a
Merge pull request #33051 from deepeshgarg007/timesheet_timer_button
...
fix: Timesheet timer button
2022-11-21 11:15:02 +05:30
Deepesh Garg
15e74c5d7b
fix: Viewing account ledger from party master
2022-11-20 20:30:24 +05:30
Deepesh Garg
64802d1220
fix: Timesheet timer button
2022-11-20 19:45:51 +05:30
Deepesh Garg
89631fa744
Merge pull request #32958 from pps190/fix-item-price-brand
...
fix: link `Item Price` brand to `Brand` doctype.
2022-11-19 19:14:39 +05:30
Deepesh Garg
26dcde2931
Merge pull request #32999 from ruthra-kumar/exchange_rate_reval_company_currency
...
fix: incorrect currency in Exchange rate revaluation
2022-11-19 18:30:03 +05:30
Deepesh Garg
f96c66bbc0
Merge pull request #33032 from deepeshgarg007/dimension_report_filtering
...
fix: Accounting Dimension filtering for Sales and Purchase Report
2022-11-19 18:19:37 +05:30
gavin
dd2493a541
fix(realtime): Restrict updates to only last modified or current user ( #33034 )
2022-11-18 17:17:54 +05:30
ruthra kumar
5caaccc94b
fix: always send account currency in response
2022-11-18 17:10:39 +05:30
