Ankush
d95f16ac8f
fix(bom): remove manual permission checking ( #26689 )
...
get_list does the permission checking.
2021-07-28 16:38:59 +05:30
Anupam
f4f0dde838
feat: unlinking dynamic links on trash
2021-07-28 16:16:52 +05:30
Marica
d43e6ced91
Merge branch 'develop' into pi-expense-account
2021-07-28 14:38:48 +05:30
walstanb
655b5dc190
fix: date as reference_date from bank transactions
2021-07-28 14:30:11 +05:30
Afshan
42bc0a7db8
fix: documentation link for E Invoicing ( #26684 )
2021-07-28 13:42:53 +05:30
Afshan
868a6cb26d
fix: documentation link for E Invoicing ( #26686 )
2021-07-28 13:42:13 +05:30
rohitwaghchaure
36bf5c7ed4
Merge branch 'develop' into mr_allowance_feat
2021-07-28 11:52:57 +05:30
Deepesh Garg
441adf763f
fix(minor): Consider grand total for threshold check
2021-07-28 10:51:50 +05:30
Frappe PR Bot
3a39c0f19a
fix: force reload of Opportunity in patch ( #26668 ) ( #26681 )
...
(cherry picked from commit ac2e139d5b
2021-07-28 00:19:32 +05:30
rohitwaghchaure
c1eb5a06a3
Merge pull request #26679 from rohitwaghchaure/removed-remarks-field-from-ar-ap-report-develop
...
fix: removed Remarks column from AR/AP report
2021-07-27 22:23:40 +05:30
Rohit Waghchaure
5d121c41f3
fix: removed Remarks column from AR/AP report
2021-07-27 22:22:56 +05:30
rohitwaghchaure
69983eb8ff
Merge pull request #26678 from rohitwaghchaure/fixed-dict-object-has-no-attr-develop
...
fix: not able to add employee in the job card
2021-07-27 22:22:10 +05:30
Rohit Waghchaure
7903aeca7e
fix: not able to add employee in the job card
2021-07-27 22:19:41 +05:30
Deepesh Garg
5a7fad8a6a
feat: Enhancements in TDS
2021-07-27 18:55:14 +05:30
rohitwaghchaure
82d0cfc68e
Merge pull request #26676 from rohitwaghchaure/fixed-dict-object-has-no-attr-pre
...
fix: not able to add employee in the job card
2021-07-27 18:46:59 +05:30
Rohit Waghchaure
940356d28a
fix: not able to add employee in the job card
2021-07-27 18:45:17 +05:30
Ankush
7a97b6d6a8
fix: reload manufacturing setting before patch ( #26641 )
...
(cherry picked from commit c8d7a8c781
2021-07-27 11:19:33 +00:00
Anupam
ee1089ca4f
Merge branch 'develop' of https://github.com/frappe/erpnext into campaign-module
2021-07-27 16:49:24 +05:30
Anupam
f1c697ca75
fix: sider issue
2021-07-27 16:49:04 +05:30
Deepesh Garg
9d8efbe1db
Merge pull request #26651 from deepeshgarg007/exchange_rate_reval_fixes_v13_pre_release
...
fix: Exchange rate revaluation posting date and precision fixes
2021-07-27 16:41:59 +05:30
Deepesh Garg
3ee61af676
Merge pull request #26628 from deepeshgarg007/exchange_rate_reval_fixes
...
fix: Exchange rate revaluation posting date and precision fixes
2021-07-27 16:41:04 +05:30
Ankush
c8d7a8c781
fix: reload manufacturing setting before patch ( #26641 )
2021-07-27 16:39:38 +05:30
Ankush Menat
dfdd1c6e02
feat: don't recompute taxes
2021-07-27 14:49:44 +05:30
Rohit Waghchaure
6b482ebb0f
fix: serial no and batch validation
2021-07-27 13:42:37 +05:30
Deepesh Garg
2dbfb932b4
Merge pull request #26618 from nemesis189/supplier-invoice-importer-fix
...
fix: Supplier invoice importer fix
2021-07-27 10:27:07 +05:30
Anuja Pawar
9302e0b6c5
Merge branch 'develop' into sa-vat-report
2021-07-27 10:18:53 +05:30
Deepesh Garg
831ce88d1c
Merge pull request #26643 from nemesis189/ignore-mandatory-in-payment-reconcilitation-pre-release
...
fix:Ignore mandatory fields while creating payment reconciliation Journal Entry
2021-07-27 10:16:04 +05:30
Deepesh Garg
af84ce9216
Merge pull request #26647 from deepeshgarg007/gst_sales_register_fix_v13
...
fix(India): Default value for export type
2021-07-27 10:12:33 +05:30
Anupam Kumar
34353df48c
fix: sales pipeline graph issue ( #26626 )
2021-07-27 09:47:44 +05:30
Jannat Patel
ae9d1d9617
fix: Salary component account filter ( #26604 )
...
* fix: salary component account filter
* fix: cleanup
2021-07-27 09:40:12 +05:30
Ankush Menat
03a6c38f06
test: fix test due to rename change
2021-07-26 22:24:25 +05:30
marination
77f9f048b6
chore: test case for missing default warehouse on mapping
2021-07-26 21:33:17 +05:30
Marica
a4bafe2dbf
Merge branch 'develop' into pi-expense-account
2021-07-26 20:15:20 +05:30
marination
5c82af50f9
fix: Set Expense account from warehouse only if warehouse exists
2021-07-26 19:41:53 +05:30
Deepesh Garg
1b6c75bbb1
Merge pull request #26642 from deepeshgarg007/gstr_3b_missing_cess_develop
...
fix: Add missing cess amount in GSTR-3B report
2021-07-26 19:21:29 +05:30
Deepesh Garg
61d014d249
Merge pull request #26644 from deepeshgarg007/gstr_3b_missing_cess_v13
...
fix: Add missing cess amount in GSTR-3B report
2021-07-26 19:20:50 +05:30
Deepesh Garg
8a6aa0d788
Merge pull request #26645 from deepeshgarg007/gst_reports_timeout_develop
...
fix: GST Reports timeout issue
2021-07-26 19:20:12 +05:30
Deepesh Garg
3fcc5e3134
fix: Convert null values to empty string on grouping
2021-07-26 19:09:09 +05:30
Deepesh Garg
19a0ca1980
fix: Ignore GL Entry on cancel
2021-07-26 19:08:56 +05:30
Deepesh Garg
356a55258e
fix: Exchange rate revaluation posting date and precision fixes
2021-07-26 19:08:45 +05:30
Deepesh Garg
b23315a7e6
Merge branch 'develop' into exchange_rate_reval_fixes
2021-07-26 19:05:44 +05:30
Deepesh Garg
cba847b051
fix: Test case for GSTR-3b report
2021-07-26 18:46:27 +05:30
Deepesh Garg
a661667e2a
fix(India): Default value for export type
2021-07-26 18:46:14 +05:30
Noah Jacob
ba18a96b0c
test: test case for over transfer of materials
2021-07-26 18:12:40 +05:30
Noah Jacob
bc82344fc7
feat: over transfer allowance for material transfers
2021-07-26 18:12:37 +05:30
Anuja Pawar
abc63cffa8
fix: suggested changes
2021-07-26 18:11:38 +05:30
Deepesh Garg
5fe7d80a64
fix: GST Reports timeout issue
2021-07-26 17:13:28 +05:30
Deepesh Garg
19589b1e21
fix: GST Reports timeout issue
2021-07-26 17:05:48 +05:30
Deepesh Garg
c468e4a93d
fix: Add missing cess amount in GSTR-3B report
2021-07-26 16:58:07 +05:30
Deepesh Garg
00fd319531
fix: Add missing cess amount in GSTR-3B report
2021-07-26 16:52:54 +05:30
Subin Tom
50b76d04bf
fix:Ignore mandatory fields while creating payment reconciliation Journal Entry
2021-07-26 16:52:05 +05:30
Deepesh Garg
4e0664b548
Merge branch 'develop' into supplier-invoice-importer-fix
2021-07-26 16:48:11 +05:30
Subin Tom
ed68f11a46
fix: Supplier invoice importer fix pre release ( #26636 )
...
* fix: Supplier Invoice Importer fix
Co-authored-by: Subin Tom <subin-home@Subins-MacBook-Air.local>
2021-07-26 16:47:36 +05:30
Noah Jacob
64454a5dc8
fix: included company in Link Document Type filters for contact ( #26576 )
...
(cherry picked from commit cbddedab7b
2021-07-26 07:32:43 +00:00
Noah Jacob
cbddedab7b
fix: included company in Link Document Type filters for contact ( #26576 )
2021-07-26 12:54:35 +05:30
Rohit Waghchaure
60a0b7fe77
Merge branch 'version-13-hotfix' into 'version-13-pre-release-13-8'
2021-07-26 11:34:57 +05:30
Deepesh Garg
67273b9551
fix: Convert null values to empty string on grouping
2021-07-25 21:26:22 +05:30
Deepesh Garg
a8bf61c14e
Merge branch 'develop' of https://github.com/frappe/erpnext into exchange_rate_reval_fixes
2021-07-25 19:58:04 +05:30
Deepesh Garg
c485d5c3b7
fix: Ignore GL Entry on cancel
2021-07-25 19:46:50 +05:30
Deepesh Garg
f4701c174a
fix: Exchange rate revaluation posting date and precision fixes
2021-07-25 19:46:20 +05:30
Ankush
cd12d95a24
fix: incorrect amount in work order required items table. ( #26585 )
...
* fix: amount in work order not equal to rate * qty
* fix: patch for amount in work order required items
2021-07-25 13:10:50 +05:30
Ankush
96caae1f56
fix: wrong operation time in Work Order ( #26613 ) ( #26617 )
...
* fix: wrong operation time in Work Order
Top level item time operation was not considering the BOM.quantity
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2021-07-25 13:01:21 +05:30
Rucha Mahabal
017ed3f5c1
fix: employee status server-side validation ( #26615 )
2021-07-24 00:08:02 +05:30
rohitwaghchaure
9052a3b1a8
Merge pull request #26614 from rohitwaghchaure/fixed-serial-no-not-link-to-batch-error
...
fix: serial no and batch validation
2021-07-23 23:38:02 +05:30
Subin Tom
fac88a3329
fix: Supplier Invoice Importer fix
2021-07-23 21:23:48 +05:30
Subin Tom
2fc39fcade
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2021-07-23 20:55:24 +05:30
rohitwaghchaure
9ef157b23b
fix: wrong operation time in Work Order ( #26613 )
...
* fix: wrong operation time in Work Order
Top level item time operation was not considering the BOM.quantity
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-07-23 20:44:34 +05:30
Anurag0911
4128aa7628
fix: syntax error ( #26610 )
...
Removed "," at erpnext/public/js/controllers/taxes_and_totals.js:87
2021-07-23 16:52:42 +05:30
Rohit Waghchaure
45d506c489
fix: serial no and batch validation
2021-07-23 16:40:45 +05:30
GangaManoj
add2030553
fix: Sider issues
2021-07-23 03:58:27 +05:30
GangaManoj
aed39a23dc
fix: Rename tests
2021-07-23 03:45:59 +05:30
GangaManoj
13e7103ee0
fix: Add test to check if payment terms are fetched when creating a Purchase Invoice
2021-07-23 03:44:56 +05:30
GangaManoj
de6d960381
fix: Add test to check if payment terms are fetched when creating a Purchase Invoice
2021-07-23 03:36:37 +05:30
GangaManoj
9c07454f91
fix: Add test to check if payment terms are fetched when creating a Sales Invoice
2021-07-23 03:23:29 +05:30
GangaManoj
caa106b3bd
fix: Add test to check if payment terms are fetched when creating a Sales Invoice
2021-07-22 22:58:45 +05:30
Nabin Hait
595c7a6e61
fix: merge conflict
2021-07-22 17:11:20 +05:30
Nabin Hait
7551bcf421
bumped to version 13.7.1
2021-07-22 17:25:51 +05:50
rohitwaghchaure
ce3e877c40
fix: incorrect bom name (bp #26600 )
2021-07-22 16:10:58 +05:30
rohitwaghchaure
56c67743ab
fix: incorrect bom name ( #26600 )
2021-07-22 16:10:06 +05:30
Ankush
5b32fa5ccd
fix: SQL error on fetching RM in production plan (bp #26592 )
...
* fix: SQL error on fetching RM in production plan
* refactor: avoid passing by reference and mutations
2021-07-22 14:00:01 +05:30
Devin Slauenwhite
0d968fabfe
fix: missing parameter 'country'
2021-07-22 13:44:09 +05:30
marination
eecfc4c0ae
fix: Clean Serial No input on Server Side
2021-07-22 13:23:54 +05:30
Ankush
4ee6571784
fix: SQL error on fetching RM in production plan ( #26592 )
...
* fix: SQL error on fetching RM in production plan
* refactor: avoid passing by reference and mutations
2021-07-22 13:13:46 +05:30
Nabin Hait
13466bba90
Merge pull request #26588 from deepeshgarg007/tax_flow_fix_pre_release
...
fix: Additional discount calculations in Invoices
2021-07-22 11:30:47 +05:30
GangaManoj
4323f4bcac
fix: Modify set_payment_schedule() to include fetch_payment_terms_from_order()
2021-07-22 05:57:42 +05:30
Deepesh Garg
9ab18b5341
fix: add company change trigger
2021-07-21 23:18:17 +05:30
Deepesh Garg
9fa92c912b
fix: Revert refresh field
2021-07-21 23:18:17 +05:30
Deepesh Garg
72eb72f66f
fix: Add update item tax template method back
2021-07-21 23:18:17 +05:30
Deepesh Garg
50b188214d
revert: Client side handling for Dynamic GST Rates
2021-07-21 23:18:17 +05:30
Deepesh Garg
f9da88cb15
fix: Additional discount calculations in Invoices
2021-07-21 23:17:56 +05:30
Rohit Waghchaure
f3158ea448
fix: removed Remarks column from AR/AP report
2021-07-21 19:47:41 +05:30
rohitwaghchaure
ac6bfeaa8d
Merge pull request #26558 from rohitwaghchaure/fixed-incorrect-gross-profit-report
...
fix: incorrect valuation rate calculation in gross profit report
2021-07-21 19:35:55 +05:30
rohitwaghchaure
6fbb2d3507
Merge pull request #26504 from 18alantom/fix-ig-portal-field-filter
...
fix: check if field_filters is None
2021-07-21 11:28:14 +05:30
rohitwaghchaure
f60cba28ab
Merge pull request #26506 from 18alantom/bp-fix-ig-portal-field-filter
...
fix: check if field_filters is None
2021-07-21 11:28:06 +05:30
Deepesh Garg
3e109840f9
Merge pull request #26464 from nemesis189/added-dispatch-address-to-sales
...
feat: Added dispatch address fields in Sales Ord, Sales Inv, Delivery Note for Eway Bill
2021-07-21 10:52:10 +05:30
Rucha Mahabal
57514f7b1d
feat(Non Profit): API Endpoint to update halted Razorpay subscriptions ( #26427 ) ( #26564 )
...
* feat: Update Subscription Activated field to Subscription Status to accomodate Halted status
* feat: API Endpoint to halt Razorpay subscription
* fix: sider
* fix: validation message
* test: halted razorpay subscription
2021-07-21 00:46:34 +05:30
Rucha Mahabal
a758071532
feat(Non Profit): API Endpoint to update halted Razorpay subscriptions ( #26427 )
...
* feat: Update Subscription Activated field to Subscription Status to accomodate Halted status
* feat: API Endpoint to halt Razorpay subscription
* fix: sider
* fix: validation message
* test: halted razorpay subscription
2021-07-21 00:24:09 +05:30
GangaManoj
46bed5e6cc
fix: Add mandatory_depends_on property for Discount Account
2021-07-20 22:03:44 +05:30
Subin Tom
013b352639
fix: Price list rate not fetched for return sales invoice fixed ( #26559 )
...
Co-authored-by: Subin Tom <subin-home@Subins-MacBook-Air.local>
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
2021-07-20 21:03:11 +05:30
Ganga Manoj
41705acbd9
fix: delete child docs when parent doc is deleted ( #26518 )
...
* fix: Make code more readable
* fix: Delete child table info when parent doc is deleted
* fix: Sider issues
* fix: Remove trailing whitespace
2021-07-20 20:48:57 +05:30
Subin Tom
2d225e621f
fix: Price list rate not fetched for return sales invoice fixed ( #26560 )
...
Co-authored-by: Subin Tom <subin-home@Subins-MacBook-Air.local>
2021-07-20 20:41:04 +05:30
Rohit Waghchaure
c14aa45720
fix: incorrect valuation rate calculation in gross profit report
2021-07-20 18:19:15 +05:30
Rucha Mahabal
99de84ebe1
Merge branch 'develop' into fix-employee-onboarding-status
2021-07-20 12:22:10 +05:30
Suraj Shetty
85c8daae9c
fix: Pass doc and other parameters to properly prefill information - while creating customer from form dashboard
2021-07-20 10:24:14 +05:30
Suraj Shetty
c077314568
fix: Pass doc and other parameters to properly prefill information
...
- while creating customer from form dashboard
2021-07-20 09:57:18 +05:30
GangaManoj
82d147ea62
fix: Tests
2021-07-20 05:16:33 +05:30
GangaManoj
59ee6958aa
fix: Make discount_account mandatory if discount accounting is enabled
2021-07-20 03:52:39 +05:30
GangaManoj
4105e27138
fix: Create GL Entries for Additional Discount Account
2021-07-20 03:46:02 +05:30
Ganga Manoj
1d830dfd92
fix: Filter for additional_discount_account
...
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2021-07-19 23:47:58 +05:30
Ganga Manoj
8fc9c13734
fix: Filter for additional_discount_account
...
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2021-07-19 23:46:38 +05:30
Ganga Manoj
0ea2934cd5
fix: GL Entry creation
...
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2021-07-19 23:44:55 +05:30
Ganga Manoj
63b7ecd0fe
fix: Use the item's project instead of the invoice's
...
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2021-07-19 23:44:21 +05:30
Ganga Manoj
980798c6fd
fix: Use the item's cost centre instead of the Invoice's
...
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2021-07-19 23:43:36 +05:30
Ankush
92273cade0
fix(ux): item description should fall back to name ( #26339 ) ( #26552 )
...
Don't set item description = item code from front end. This is already
being set to item_name in before_insert and item_name is better
fallback than item code for description.
Also fixed wrong condition for erasing description while duplicating
item.
2021-07-19 20:44:05 +05:30
Ankush
80e269887d
fix(ux): item description should fall back to name ( #26339 )
...
Don't set item description = item code from front end. This is already
being set to item_name in before_insert and item_name is better
fallback than item code for description.
Also fixed wrong condition for erasing description while duplicating
item.
2021-07-19 20:42:44 +05:30
Anuja Pawar
ba31e3695f
Merge branch 'develop' into sa-vat-report
2021-07-19 20:40:25 +05:30
Subin Tom
b24a149dbc
test: Updated test case for Eway bill
2021-07-19 14:37:12 +05:30
Deepesh Garg
2686d04800
fix: Typo and remove duplicate function
2021-07-18 17:54:35 +05:30
Anuja Pawar
2bbf48e835
Merge branch 'develop' into sa-vat-report
2021-07-18 11:13:25 +05:30
Devin Slauenwhite
d5ff636159
fix: missing parameter 'country'
2021-07-17 14:42:38 -04:00
GangaManoj
831f5edd02
fix: Remove unused imports
2021-07-17 22:55:24 +05:30
GangaManoj
cde0cc0678
fix: Fetch Payment Terms from Sales/Purchase Orders
2021-07-17 22:53:21 +05:30
Ganga Manoj
bfb7256143
Merge branch 'develop' into enable-discount-accounting
2021-07-17 20:01:09 +05:30
GangaManoj
d6956ff075
fix: Add test for additional discount applied on taxes
2021-07-17 19:49:42 +05:30
GangaManoj
228499369c
fix: Switch debit and credit for ledger entries for discount applied on taxes for Purchase Invoice
2021-07-17 19:49:16 +05:30
GangaManoj
99551e9b7f
fix: Add test for additional discount applied on taxes
2021-07-17 18:45:21 +05:30
GangaManoj
c4d2dc0da3
fix: Remove unnecessary condition
2021-07-17 17:47:20 +05:30
GangaManoj
c2ba6897b0
fix: Only display Additional Discount Account if Enable Discount Accounting is checked
2021-07-17 17:45:35 +05:30
GangaManoj
fa4c03e7a1
fix: Create ledger entries for discount applied on taxes in make_tax_gl_entries
2021-07-17 17:42:36 +05:30
GangaManoj
7bbc9a886d
fix: Filter options for Additional Discount Account
2021-07-17 17:41:06 +05:30
GangaManoj
87d448e039
fix: Add Additional Discount Account field
2021-07-17 17:40:43 +05:30
GangaManoj
b0f21824bc
fix: Check all expected GL Entries
2021-07-17 17:34:50 +05:30
Nabin Hait
11475487fb
fix: merge conflict
2021-07-16 15:58:50 +05:30
Nabin Hait
e079a1bb33
bumped to version 13.7.0
2021-07-16 15:41:33 +05:50
Rohit Waghchaure
56e4a88956
fix: added patch to fix missing FG item
2021-07-16 15:06:57 +05:30
Nabin Hait
9ddf33715e
Merge pull request #26513 from rohitwaghchaure/patch-to-fix-missing-fg-item
...
fix: added patch to fix missing FG item
2021-07-16 15:05:23 +05:30
Noah Jacob
3362c080b6
fix: validation check when no conversion_factor ( #26527 )
2021-07-16 15:00:08 +05:30
Rohit Waghchaure
13e9aa5956
fix: added patch to fix missing FG item
2021-07-16 14:34:24 +05:30
Rohit Waghchaure
0c6ca09e06
fix: added patch to fix missing FG item
2021-07-16 14:33:25 +05:30
Nabin Hait
f6d6897f34
Merge pull request #26525 from nabinhait/change-log-v13-7-0
...
chore: Added change log for v13.7.0
2021-07-16 13:09:31 +05:30
Nabin Hait
a0df79ee8c
chore: Added change log for v13.7.0
2021-07-16 13:07:39 +05:30
Rohit Waghchaure
df5c2b9aaf
fix: FG item not fetched in manufacture entry
2021-07-16 11:35:14 +05:30
GangaManoj
6bff653cf0
fix: Sider issues
2021-07-16 02:18:45 +05:30
GangaManoj
857501cbe1
fix: Make additional GL Entries for discount applied on taxes
2021-07-15 22:03:46 +05:30
GangaManoj
40412f7e61
fix: Only display Additional Discount Account if Enable Discount Accounting is checked
2021-07-15 22:02:43 +05:30
GangaManoj
8e96e2d5a2
fix: Filter options for Additional Discount Account
2021-07-15 22:01:38 +05:30
GangaManoj
4f2bf98966
fix: Add Additional Discount Account field
2021-07-15 22:01:02 +05:30
Rohit Waghchaure
a748dd9261
feat: provision to make subcontracted purchase order from the production plan
2021-07-15 19:01:36 +05:30
Noah Jacob
d8668f78f4
fix: validation check when no conversion_factor ( #26219 )
2021-07-15 18:32:15 +05:30
Afshan
9b9b18c286
fix: improving ux for additional discount field ( #26502 )
2021-07-15 18:11:22 +05:30
Afshan
c66277e06b
fix: improving ux for additional discount field ( #26495 )
2021-07-15 18:10:17 +05:30
Noah Jacob
26a9d38547
fix: WIP needs to be set before submit on skip_transfer ( #26500 )
2021-07-15 16:50:41 +05:30
Noah Jacob
d319e10883
fix: set default operation time to 0 ( #26511 )
2021-07-15 16:49:55 +05:30
Noah Jacob
6442b5df11
fix: set default operation time to 0 ( #26510 )
2021-07-15 16:47:50 +05:30
Noah Jacob
2f775ee53c
fix: WIP needs to be set before submit on skip_transfer ( #26507 )
2021-07-15 16:29:28 +05:30
Rohit Waghchaure
9997cce1ea
fix: FG item not fetched in manufacture entry
2021-07-15 15:32:21 +05:30
rohitwaghchaure
4d444559ff
Merge pull request #26508 from rohitwaghchaure/fixed-fg-items-not-added-for-batch-item
...
fix: FG item not fetched in manufacture entry
2021-07-15 15:32:05 +05:30
Noah Jacob
eeecb25a02
fix: WIP needs to be set before submit on skip_transfer ( #26499 )
2021-07-15 15:31:42 +05:30
Rohit Waghchaure
74b97b5ec9
fix: FG item not fetched in manufacture entry
2021-07-15 14:52:21 +05:30
Deepesh Garg
cc73e7d6fa
Merge pull request #26472 from deepeshgarg007/payment_entry_taxes_unallocated_amount_v13
...
fix: Unallocated amount in Payment Entry after taxes
2021-07-15 12:38:45 +05:30
Deepesh Garg
5ad759897f
Merge pull request #26471 from deepeshgarg007/payment_entry_taxes_unallocated_amount
...
fix: Unallocated amount in Payment Entry after taxes
2021-07-15 12:38:32 +05:30
Deepesh Garg
1524e7f5ba
Merge pull request #26412 from deepeshgarg007/payment_entry_taxes_v12
...
fix: Unallocated amount in Payment Entry after taxes
2021-07-15 12:38:23 +05:30
Anuja Pawar
888d1f94ce
Merge branch 'develop' into sa-vat-report
2021-07-15 12:17:46 +05:30
18alantom
12f7befa13
fix: check if field_filters is None
2021-07-15 12:09:33 +05:30
18alantom
ca1169eeba
fix: check if field_filters is None
2021-07-15 12:03:41 +05:30
marination
219623279f
fix: Paging buttons not working on item group portal page
2021-07-14 20:50:22 +05:30
marination
f40da4ac4c
fix: Paging buttons not working on item group portal page
2021-07-14 20:48:06 +05:30
Anuja Pawar
259947dae9
Merge branch 'develop' into sa-vat-report
2021-07-14 20:47:41 +05:30
Anuja Pawar
b43974a9a6
fix: more sider fixes
2021-07-14 20:37:48 +05:30
Marica
dbf835ced3
Merge branch 'develop' into paging-btns
2021-07-14 20:15:22 +05:30
marination
4c6e952902
fix: Paging buttons not working on item group portal page
2021-07-14 20:01:36 +05:30
Afshan
74d7baa80a
fix: filter by accounts with group by accounts ( #26438 )
...
* fix: filter by accounts with group by accounts
* fix: parsing json
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2021-07-14 19:59:11 +05:30
18alantom
9ea5072c52
fix: set item group as a persistent filter
2021-07-14 17:41:38 +05:30
18alantom
b24c0bfbf9
fix: show child item group items on portal
2021-07-14 17:41:32 +05:30
18alantom
e244560fb9
fix: set item group as a persistent filter
2021-07-14 17:40:10 +05:30
18alantom
7558e7f115
fix: show child item group items on portal
2021-07-14 17:40:04 +05:30
Marica
3f599b049c
Merge branch 'develop' into fix-item-group-portal-issues
2021-07-14 17:15:18 +05:30
Deepesh Garg
13fffeb97b
Merge pull request #26473 from deepeshgarg007/bootstrapped_gst_setup_develop
...
feat(India): Bootstrapped GST Setup
2021-07-14 16:44:12 +05:30
Noah Jacob
03f4db0606
fix: validation check for batch for stock reconciliation type in stock entry(bp #26370 ) ( #26488 )
...
* fix(ux): added filter for valid batch nos.
* fix: not validating batch no if entry type stock reconciliation
* test: validate batch_no
2021-07-14 16:28:54 +05:30
Noah Jacob
2c67894135
fix: validation check for batch for stock reconciliation type in stock entry(bp #26370 ) ( #26487 )
...
* fix(ux): added filter for valid batch nos.
* fix: not validating batch no if entry type stock reconciliation
* test: validate batch_no
2021-07-14 16:28:40 +05:30
Noah Jacob
c932baeb32
fix: validation check for batch for stock reconciliation type in stock entry ( #26370 )
...
* fix(ux): added filter for valid batch nos.
* fix: not validating batch no if entry type stock reconciliation
* test: validate batch_no
2021-07-14 16:25:42 +05:30
Kenneth Sequeira
513375f264
fix: Nested/Multi-level BOM help link ( #26409 )
...
Updated the link for multi-level boms. Current link is broken.
2021-07-14 16:07:47 +05:30
Kenneth Sequeira
7a89033163
fix: update integration links in help.js ( #26483 )
2021-07-14 16:07:31 +05:30
Kenneth Sequeira
24e08301bc
fix: update integration links in help.js ( #26483 )
2021-07-14 16:02:49 +05:30
Saqib
72715956f1
fix: tds computation summary shows cancelled invoices ( #26486 )
2021-07-14 15:56:20 +05:30
Anuja Pawar
c5d7a13513
fix: sider & translation fixes
2021-07-14 15:49:22 +05:30
18alantom
ddbf7c0020
fix: set item group as a persistent filter
2021-07-14 15:43:22 +05:30
Saqib
ac721ae147
fix: tds computation summary shows cancelled invoices ( #26485 )
2021-07-14 15:20:14 +05:30
Anuja Pawar
b37ff0d3cf
fix: sider fixes
2021-07-14 15:06:56 +05:30
Jannat Patel
ccb52f19bc
fix: task status loop ( #26006 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-07-14 14:46:16 +05:30
Saqib
1c76154096
fix: tds computation summary shows cancelled invoices ( #26456 )
2021-07-14 14:45:39 +05:30
Saqib
9c04079d04
fix: test fails due to improper gain loss account set ( #26482 ) ( #26484 )
2021-07-14 14:45:11 +05:30
Afshan
9168bb369a
fix: filter by accounts with group by accounts ( #26439 )
2021-07-14 13:57:14 +05:30
Saqib
d86cdb4368
Merge branch 'develop' into payment_entry_taxes_unallocated_amount
2021-07-14 13:55:09 +05:30
Saqib
be773f4052
Merge branch 'develop' into bootstrapped_gst_setup_develop
2021-07-14 13:55:00 +05:30
Saqib
c978fdf3df
fix: test fails due to improper gain loss account set ( #26482 )
2021-07-14 13:53:30 +05:30
Frappe
1dfb5eb535
feat: South Africa VAT report
2021-07-14 12:33:45 +05:30
Saqib
bb493a0602
Merge pull request #26159 from GangaManoj/asset-credit-note
2021-07-14 12:02:02 +05:30
Ganga Manoj
05d7c69aa2
fix: delete child docs when parent doc is deleted ( #26239 )
2021-07-14 11:54:27 +05:30
Ganga Manoj
f4fc1384a5
fix(Issue): Calculate first_response_time based on working hours ( #25991 )
2021-07-14 11:43:10 +05:30
