Anupam
59c971015a
fix: test case
2021-08-06 14:02:57 +05:30
Saqib
668f442139
Merge branch 'develop' into po-payment-terms
2021-08-06 13:42:10 +05:30
Frappe PR Bot
c8e6c07032
fix(e-invoicing): cannot generate IRNs for standalone credit notes ( #26824 ) ( #26833 )
2021-08-06 12:33:18 +05:30
Anupam
01a0585ba0
fix: removing organization_lead traceback
2021-08-06 12:21:02 +05:30
Anupam
4723e18f9e
fix: sider issue
2021-08-06 11:16:55 +05:30
Noah Jacob
cb44aed78b
test: get sales order with variant
2021-08-06 11:16:25 +05:30
Deepesh Garg
ffd7642de2
Merge pull request #26832 from deepeshgarg007/budget_test_case
...
test: Failing budget test due to project naming
2021-08-06 11:14:47 +05:30
Saqib
e7fa2e5826
fix(e-invoicing): cannot generate IRNs for standalone credit notes ( #26824 )
2021-08-06 11:03:57 +05:30
Frappe PR Bot
2e352834a2
fix: fetching of item tax from hsn code ( #26736 ) ( #26792 )
...
* fix: fetching of item tax from hsn code
(cherry picked from commit 3a50490c04
2021-08-06 10:59:29 +05:30
Deepesh Garg
6871c07685
test: Failing budget test due to project naming
2021-08-06 10:53:38 +05:30
Frappe PR Bot
b13e46071a
fix: Let all System Managers be able to delete Company transactions ( #26815 ) ( #26819 )
...
(cherry picked from commit 884d8cf065
2021-08-06 10:39:58 +05:30
Nabin Hait
418d478dad
Merge pull request #26764 from nabinhait/addl_salary_fix
...
fix: Additional salary processing
2021-08-06 10:24:03 +05:30
Nabin Hait
894ed3a9a5
Merge pull request #26765 from frappe/revert-24206-additional_salary_tax_enhancements
...
Revert "fix: Tax calculation for Recurring additional salary"
2021-08-06 10:22:31 +05:30
GangaManoj
232c728636
Revert "fix: Only fetch default Payment Terms Template if present"
...
This reverts commit fb80ca9e06
2021-08-05 23:04:58 +05:30
GangaManoj
fb80ca9e06
fix: Only fetch default Payment Terms Template if present
2021-08-05 22:04:11 +05:30
GangaManoj
5c21eea13d
fix: Fetch discount details from Payment Terms only if Discount Type = Percentage
2021-08-05 21:50:09 +05:30
GangaManoj
e4a07d8ff3
fix: Stop fetching amount while fetching Payment Terms
2021-08-05 21:42:09 +05:30
Frappe PR Bot
6e07ec2617
fix: Do not fetch fully return issued purchase receipts ( #26809 ) ( #26825 )
...
(cherry picked from commit 1d90f7684e
2021-08-05 20:13:28 +05:30
Deepesh Garg
1d90f7684e
fix: Do not fetch fully return issued purchase receipts ( #26809 )
2021-08-05 19:17:32 +05:30
Noah Jacob
041ac339b1
style: improved formatting of sql query
2021-08-05 16:37:22 +05:30
Noah Jacob
b10465eebe
refactor: created function to get bom_item for query
2021-08-05 16:37:22 +05:30
noahjacob
9b0b2daf4a
refactor: updated sql query for item variants
2021-08-05 16:37:22 +05:30
noahjacob
cf4078756d
fix: fixed fetching sales order of item variant in production plan
2021-08-05 16:37:21 +05:30
Anupam
c35a526dd8
fix: adding test cases
2021-08-05 14:42:15 +05:30
Frappe PR Bot
5b5a365aaf
fix: POS payment modes displayed wrong total ( #26808 )
2021-08-05 11:15:16 +05:30
Ganga Manoj
884d8cf065
fix: Let all System Managers be able to delete Company transactions ( #26815 )
2021-08-05 11:14:46 +05:30
GangaManoj
4a6ef9ab0f
fix: Compare Payment Schedules
2021-08-05 00:52:55 +05:30
GangaManoj
0b11420147
fix: Disable automcatically_fetch_payment_terms after running its associated tests
2021-08-05 00:35:45 +05:30
Anupam
2732490cbe
fix: review changes
2021-08-05 00:30:01 +05:30
GangaManoj
23c104555b
fix: Remove irrelevant code
2021-08-05 00:28:42 +05:30
Frappe PR Bot
bf8d0c256d
fix: typo in error message ( #26816 ) ( #26817 )
...
(cherry picked from commit 005291e6dd
2021-08-04 22:01:17 +05:30
François de Ryckel
005291e6dd
fix: typo in error message ( #26816 )
2021-08-04 21:59:18 +05:30
Noah Jacob
673bc58193
test: test case for over transfer of materials
2021-08-04 18:48:24 +05:30
Noah Jacob
8fced95f8c
feat: over transfer allowance for material transfers
2021-08-04 18:48:24 +05:30
GangaManoj
8328f45230
fix: Rename test to reflect changes in code
2021-08-04 17:33:35 +05:30
Frappe PR Bot
13192e1db1
fix: trigger lost reason dialog when status is changed to lost ( #26811 ) ( #26812 )
...
(cherry picked from commit e5d8ba65ca
2021-08-04 17:07:22 +05:30
Mohammed Yusuf Shaikh
e5d8ba65ca
fix: trigger lost reason dialog when status is changed to lost ( #26811 )
2021-08-04 16:35:38 +05:30
Anupam Kumar
df477dcae6
fix: bank remittance report issue ( #26398 ) ( #26766 )
2021-08-04 14:02:43 +05:30
Subin Tom
035ce304fe
fix: POS payment modes displayed wrong total ( #26708 )
2021-08-04 13:57:55 +05:30
Saqib
5c9d4db0e9
Merge branch 'develop' into payment-reconc-party-validation-fix
2021-08-04 13:57:00 +05:30
Dany Robert
9f94c19752
fix: ignore permission to update call log ( #26797 )
...
Backport of #26112
#no-docs
2021-08-04 10:01:44 +05:30
Frappe PR Bot
1b9a5c851d
fix: incorrect amount in work order required items table. ( #26585 ) ( #26623 )
...
* fix: amount in work order not equal to rate * qty
* fix: patch for amount in work order required items
(cherry picked from commit cd12d95a24
2021-08-03 20:06:36 +05:30
Frappe PR Bot
85815f989c
fix: Reset weight_per_unit on replacing Item ( #26619 ) ( #26791 )
...
* fix: Assign Item's default weight_per_unit as its weight_per_unit in get_item_details
* fix: Set weight_uom in get_item_details as Item's default weight_uom
(cherry picked from commit 471f48f64d
2021-08-03 20:06:07 +05:30
Saqib
3a50490c04
fix: fetching of item tax from hsn code ( #26736 )
...
* fix: fetching of item tax from hsn code
2021-08-03 15:57:11 +05:30
Deepesh Garg
4e1a205c11
fix: Optimize item updation
2021-08-03 14:58:45 +05:30
Deepesh Garg
346bde875c
Merge branch 'develop' of https://github.com/frappe/erpnext into sa-vat-report
2021-08-03 14:44:20 +05:30
Ganga Manoj
471f48f64d
fix: Reset weight_per_unit on replacing Item ( #26619 )
...
* fix: Assign Item's default weight_per_unit as its weight_per_unit in get_item_details
* fix: Set weight_uom in get_item_details as Item's default weight_uom
2021-08-03 14:39:38 +05:30
Frappe PR Bot
5a442f1bce
fix: change format string to percent string interpolation ( #26774 ) ( #26778 )
...
(cherry picked from commit 7fe588e236
2021-08-03 13:29:10 +05:30
Frappe PR Bot
373ed1f65c
fix: remove limit from stock balance report ( #26773 ) ( #26779 )
...
(cherry picked from commit b3740e9afc
2021-08-03 13:28:50 +05:30
GangaManoj
f99696b75d
fix: Condition for fetching Payment Terms from Sales/Purchase Orders
2021-08-02 23:15:44 +05:30
Anuja
f2ee1155c0
fix: sider fixes
2021-08-02 23:13:21 +05:30
Ankush
efb037b566
refactor!: drop shopify integration from ERPNext ( #26700 )
...
BREAKING CHANGE: remove Shopify integration.
The integration is moved to a separate app with additional enhancements.
The app is still FOSS and licensed under the same license as ERPNext. Any
data migration required is taken care of after installing the app and
enabling it.
New app: https://github.com/frappe/ecommerce_integrations
2021-08-02 21:57:52 +05:30
Deepesh Garg
db40d88fc2
Merge pull request #26780 from nemesis189/added-dispatch-address-to-sales-v13-new
...
feat: Added dispatch address fields in Sales Ord, Sales Inv, Delivery Note for Eway Bill
2021-08-02 21:11:50 +05:30
Subin Tom
6ba11a382a
test: Updated test case for Eway bill
2021-08-02 20:36:46 +05:30
Subin Tom
8800aaaee7
feat: Added fields for dispatch address in Sales Order, Sales Invoice, Delivery Note for Eway Bill
2021-08-02 20:36:37 +05:30
Ankush
b3740e9afc
fix: remove limit from stock balance report ( #26773 )
2021-08-02 20:13:26 +05:30
Alan
7fe588e236
fix: change format string to percent string interpolation ( #26774 )
2021-08-02 20:07:55 +05:30
Ankush
e43bdf76a5
chore: warning for shopify integration deprecation ( #26701 )
...
* chore: warning for shopify integration deprecation
* fix: warn deprecation during patch for sysadmins
2021-08-02 18:57:48 +05:30
Anuja
3bcbc86291
fix: resolved conflicts in patches.txt
2021-08-02 12:58:46 +05:30
Anuja
f9fc3bbfa8
fix: added patch for custom field and minor fixes
2021-08-02 12:54:30 +05:30
Deepesh Garg
ad7bb316c1
fix: GL Entries for discount amount with item qty greater than 1
2021-08-02 12:41:06 +05:30
Deepesh Garg
c677d47a4a
fix: Test Cases
2021-08-02 12:40:44 +05:30
Deepesh Garg
c525b372c6
fix: Tests
2021-08-02 12:40:00 +05:30
Deepesh Garg
92f7a5a390
fix: GL For taxes if discount applied on Grand Total
2021-08-02 12:39:43 +05:30
Deepesh Garg
b7267f8f5f
fix: Syntax Error
2021-08-02 12:39:22 +05:30
Frappe PR Bot
a9474a9fbd
fix: POS Invoice consolidated Sales Invoice field set to no copy ( #26768 )
2021-08-02 12:25:27 +05:30
Subin Tom
e99cd2e9da
fix: POS Invoice consolidated Sales Invoice field set to no copy ( #26706 )
2021-08-02 11:39:20 +05:30
Subin Tom
4597f151f5
fix: POS Item Cart non-stop scroll issue ( #26693 )
2021-08-02 11:38:31 +05:30
Subin Tom
3b7615750a
fix: POS Item Cart non-stop scroll issue ( #26692 )
2021-08-02 11:37:38 +05:30
Subin Tom
58118d7830
fix: missing QR Code in auto email attachment ( #26598 )
2021-08-02 11:34:43 +05:30
Subin Tom
a75c7c48d8
fix: missing QR Code in auto email attachment ( #26599 )
2021-08-02 11:34:28 +05:30
rohitwaghchaure
31fe5f5b92
fix: added progress bar in repost item valuation ( #26680 )
2021-08-02 11:01:30 +05:30
Anuja Pawar
4ec02ad91d
Merge branch 'develop' into sa-vat-report
2021-08-02 10:42:04 +05:30
Nabin Hait
74bb55bfd2
Revert "fix: Tax calculation for Recurring additional salary ( #24206 )"
...
This reverts commit adfdc71844
2021-08-01 20:03:38 +05:30
Nabin Hait
493029195c
fix: Additional salary processing
2021-08-01 19:47:42 +05:30
Rohit Waghchaure
343143037c
fix: conflicts
2021-08-01 14:45:24 +05:30
Rohit Waghchaure
8cb560c753
bumped to version 13.8.0
2021-08-01 14:55:09 +05:50
Deepesh Garg
36f6e9b58e
Merge pull request #26654 from marination/pi-expense-account
...
fix: Set Expense account from warehouse only if warehouse exists (Inter company invoice)
2021-07-31 17:32:24 +05:30
Rohit Waghchaure
6fffc90b46
chore: Added change log for v13.8.0
2021-07-31 16:22:12 +05:30
rohitwaghchaure
41da6f0d13
Merge pull request #26735 from rohitwaghchaure/fixed-cogs-in-purchase-receipt
...
fix: COGS account in purchase receipt
2021-07-31 14:50:47 +05:30
Nabin Hait
99afe375ea
Merge pull request #26237 from rtdany10/patch-5
...
feat: Increase number of supported currency exchanges
2021-07-31 11:34:15 +05:30
Rohit Waghchaure
2a14f255cf
fix: COGS account in purchase receipt
2021-07-31 11:14:14 +05:30
Deepesh Garg
6eded547f5
fix: TDS calculation for first threshold breach for TDS category 194Q
2021-07-30 20:12:51 +05:30
Frappe PR Bot
b5c7fce689
fix: student category mapping from the program enrollment tool ( #26716 ) ( #26739 )
...
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
(cherry picked from commit 1a2332a81c
2021-07-30 18:54:35 +05:30
Rucha Mahabal
1a2332a81c
fix: student category mapping from the program enrollment tool ( #26716 )
...
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
2021-07-30 18:30:15 +05:30
Subin Tom
b8845b9ed9
Fix: Payment Entry party validation issue
2021-07-30 16:30:18 +05:30
Marica
7cbd755951
Merge branch 'develop' into serial-no-space
2021-07-30 14:09:19 +05:30
Saqib
d4ae1febe3
fix: gl entries for exchange gain loss ( #26734 )
2021-07-30 11:21:49 +05:30
Saqib
2d6f2fea5b
fix: gl entries for exchange gain loss ( #26728 )
2021-07-30 10:55:53 +05:30
Rucha Mahabal
821db5cce7
fix: employee status server-side validation ( #26442 )
...
* fix: employee status server-side validation
* fix: test
* test: employee inactive status
* fix: test
2021-07-30 10:21:42 +05:30
rohitwaghchaure
50b4b70589
Merge pull request #26727 from deepeshgarg007/pricing_rule_item_group_v13
...
fix: Parent condition in pricing rules
2021-07-29 20:06:47 +05:30
Deepesh Garg
9c7a9f3a13
fix: Parent condition in pricing rules
2021-07-29 20:02:49 +05:30
Marica
0eed394f5e
Merge branch 'develop' into stock-reco-fetch-non-empty-stock
2021-07-29 19:54:56 +05:30
rohitwaghchaure
bd33bdf210
Merge pull request #26717 from deepeshgarg007/pricing_rule_item_group
...
fix: Parent condition in pricing rules
2021-07-29 19:51:53 +05:30
rohitwaghchaure
22eac9bd0c
Merge pull request #26720 from rohitwaghchaure/skip-cancelled-entries-in-report-develop
...
fix: remove cancelled entries from Stock and Account Value comparison report
2021-07-29 19:50:00 +05:30
rohitwaghchaure
b7bbefee15
Merge pull request #26722 from rohitwaghchaure/skip-cancelled-entries-in-report
...
fix: remove cancelled entries from Stock and Account Value comparison report
2021-07-29 19:49:42 +05:30
Ankush
57cd273f7c
fix: empty "against account" in Purchase Receipt GLE bp #26712 ( #26719 )
...
* fix: correct field for GLE against account in PR
* fix: remove incorrect field check from reposting
2021-07-29 19:49:36 +05:30
Ankush
c7df759324
fix: empty "against account" in Purchase Receipt GLE bp #26712 ( #26718 )
...
* fix: correct field for GLE against account in PR
* fix: remove incorrect field check from reposting
2021-07-29 19:49:12 +05:30
marination
533ee9a401
feat: (Stock Reco) Ignore Empty Stock while fetching items from warehouse
...
- Added checkbox to `Fetch Items from Warehouse` dialog to ignore empty stock
- fix: Items fetched twice due to Item Defaults
- Improved code readability
2021-07-29 19:39:32 +05:30
GangaManoj
01ab63189a
fix: Check if Purchase Order has Payment Terms Template
2021-07-29 19:28:14 +05:30
GangaManoj
6343950d82
fix: Sider issues
2021-07-29 19:27:54 +05:30
GangaManoj
57df4a3aa1
fix: Rename tests
2021-07-29 19:27:54 +05:30
GangaManoj
0413a5aafd
fix: Add test to check if payment terms are fetched when creating a Purchase Invoice
2021-07-29 19:27:52 +05:30
GangaManoj
e94604f517
fix: Add test to check if payment terms are fetched when creating a Purchase Invoice
2021-07-29 19:26:39 +05:30
GangaManoj
293c5e10c3
fix: Add test to check if payment terms are fetched when creating a Sales Invoice
2021-07-29 19:26:39 +05:30
GangaManoj
59d1cc02c5
fix: Add test to check if payment terms are fetched when creating a Sales Invoice
2021-07-29 19:26:39 +05:30
GangaManoj
def7cc6cb3
fix: Modify set_payment_schedule() to include fetch_payment_terms_from_order()
2021-07-29 19:26:39 +05:30
GangaManoj
b389c9e375
fix: Fetch Payment Terms from Sales/Purchase Orders
2021-07-29 19:25:29 +05:30
GangaManoj
1011c1b01a
fix: Clear Payment Schedule if PI has default Payment Schedule, but linked PO doensn't
2021-07-29 19:24:29 +05:30
GangaManoj
c7c90244fe
fix: Check if Purchase Order has Payment Terms Template
2021-07-29 19:19:46 +05:30
rohitwaghchaure
020b8ae110
Merge pull request #26721 from rohitwaghchaure/skip-cancelled-entries-in-report-pre
...
fix: remove cancelled entries from Stock and Account Value comparison report
2021-07-29 19:18:58 +05:30
Rohit Waghchaure
a6d276a06f
fix: remove cancelled entries from Stock and Account Value comparison report
2021-07-29 19:16:20 +05:30
Rohit Waghchaure
c1c5a4ae17
fix: remove cancelled entries from Stock and Account Value comparison report
2021-07-29 19:15:34 +05:30
Deepesh Garg
8b7e3775c2
Merge pull request #26712 from ankush/against_acc_pr
...
fix: empty "against account" in Purchase Receipt GLE
2021-07-29 19:10:38 +05:30
Deepesh Garg
19a6d80927
fix: Parent condition in pricing rules
2021-07-29 18:47:16 +05:30
Jannat Patel
e99f68fd7e
fix: expense claim semgrep issue ( #26709 )
...
* fix: expense claim semgrep issue
* fix: sider
2021-07-29 18:31:38 +05:30
Rohit Waghchaure
379ce70126
fix: remove cancelled entries from Stock and Account Value comparison report
2021-07-29 18:06:17 +05:30
Saqib
bbb96899a5
Merge branch 'develop' into po-payment-terms
2021-07-29 17:23:09 +05:30
Dany Robert
2833a02e0e
Merge branch 'develop' into patch-5
2021-07-29 16:47:28 +05:30
Dany Robert
909995a441
fix: issue with cache.setex
2021-07-29 15:58:27 +05:30
Deepesh Garg
e014d7a00e
Merge pull request #26710 from deepeshgarg007/tds_194q_calculations
...
fix: TDS calculation for first threshold breach for TDS category 194Q
2021-07-29 15:55:16 +05:30
Saqib
e39bbc85e1
fix: cannot cancel payment entry if linked with invoices ( #26703 )
2021-07-29 15:46:25 +05:30
Ankush Menat
5764b49767
fix: remove incorrect field check from reposting
2021-07-29 15:41:22 +05:30
Nabin Hait
237150d1f4
Merge pull request #26630 from rohitwaghchaure/show-progress-completion-status-in-repost-item-valuation
...
fix: added progress bar in repost item valuation to check the status
2021-07-29 15:37:35 +05:30
Ankush Menat
c3e739caf8
fix: correct field for GLE against account in PR
2021-07-29 15:34:18 +05:30
Deepesh Garg
4c681592bf
fix: TDS calculation for first threshold breach for TDS category 194Q
2021-07-29 15:26:19 +05:30
Nabin Hait
ebbabf11e9
Merge pull request #25944 from ruchamahabal/fix-employee-onboarding-status
...
fix: boarding status in Employee Onboarding and Separation
2021-07-29 15:24:54 +05:30
Jannat Patel
285463b031
Merge pull request #23129 from anupamvs/email-digest
...
fix: multiselect recipients in Email Digest
2021-07-29 12:36:49 +05:30
rohitwaghchaure
04ff0bc40d
Merge pull request #26264 from noahjacob/mr_allowance_feat
...
feat: over transfer allowance for material transfers
2021-07-29 11:18:37 +05:30
Ankush
f8343890b9
feat: don't recompute taxes ( #26695 )
2021-07-29 11:09:34 +05:30
Ankush
8859574aab
feat: don't recompute taxes ( #26694 )
2021-07-29 11:09:22 +05:30
Anupam
e5fea372af
fix: frappe linter
2021-07-29 11:05:38 +05:30
Anupam
a6ce1244a0
fix: sider issues
2021-07-29 10:43:21 +05:30
Anuja
5dcd5e48e7
fix: fixed zero tax rate issue by adding custom field
2021-07-29 00:54:48 +05:30
Anupam
b1350af1f6
fix: setup wizard
2021-07-28 23:54:46 +05:30
Deepesh Garg
c6fe601efa
Merge pull request #26677 from deepeshgarg007/tds_enhancements_v13
...
feat: Enhancements in TDS
2021-07-28 20:58:42 +05:30
Deepesh Garg
e79bfbb104
Merge pull request #26665 from ankush/dont_recompute_taxes
...
feat: don't recompute taxes
2021-07-28 19:36:27 +05:30
Anupam Kumar
89f2138fbc
Merge branch 'version-13-hotfix' into email-digest
2021-07-28 18:24:29 +05:30
Anupam
47a651a80f
fix: removing depends_on for contact fields
2021-07-28 18:21:19 +05:30
Frappe PR Bot
1b6dd84c0a
fix(bom): remove manual permission checking ( #26689 ) ( #26690 )
...
get_list does the permission checking.
(cherry picked from commit d95f16ac8f
2021-07-28 18:11:11 +05:30
Anupam
49cfac0ef0
feat: added basic info. of lead in header part
2021-07-28 17:51:35 +05:30
Deepesh Garg
6ac68f3bc7
fix: Patch
2021-07-28 17:19:00 +05:30
Deepesh Garg
8c7d9efa9d
fix: Chnage fieldtype from data to check
2021-07-28 17:18:50 +05:30
Ankush
8ed7a21cd5
fix(bom): remove manual permission checking ( #26689 )
...
get_list does the permission checking.
(cherry picked from commit d95f16ac8f
2021-07-28 11:12:27 +00:00
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
Deepesh Garg
4c0dfdb398
Merge pull request #26687 from deepeshgarg007/fieldtype_fix
...
fix: Change fieldtype from data to check
2021-07-28 15:59:08 +05:30
Deepesh Garg
fa8e6ac7cd
fix: Patch
2021-07-28 15:30:05 +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
90c5cb0a31
fix: documentation link for E Invoicing ( #26685 )
2021-07-28 13:42:33 +05:30
Afshan
868a6cb26d
fix: documentation link for E Invoicing ( #26686 )
2021-07-28 13:42:13 +05:30
Deepesh Garg
9350249941
fix: Chnage fieldtype from data to check
2021-07-28 12:57:59 +05:30
rohitwaghchaure
36bf5c7ed4
Merge branch 'develop' into mr_allowance_feat
2021-07-28 11:52:57 +05:30
Deepesh Garg
1c9e516092
fix: GL Entries for discount amount with item qty greater than 1
2021-07-28 11:38:44 +05:30
Deepesh Garg
441adf763f
fix(minor): Consider grand total for threshold check
2021-07-28 10:51:50 +05:30
Deepesh Garg
64af124f88
fix(minor): Consider grand total for threshold check
2021-07-28 10:43:02 +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
Raffael Meyer
ac2e139d5b
fix: force reload of Opportunity in patch ( #26668 )
2021-07-28 00:14:59 +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
Rohit Waghchaure
56b81565fa
fix: added progress bar in repost item valuation
2021-07-27 22:11:30 +05:30
Deepesh Garg
5a7fad8a6a
feat: Enhancements in TDS
2021-07-27 18:55:14 +05:30
rohitwaghchaure
965b1fe4a0
Merge pull request #26675 from rohitwaghchaure/fixed-dict-object-has-no-attr
...
fix: not able to add employee in the job card
2021-07-27 18:47:45 +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
Rohit Waghchaure
af58ac9e10
fix: not able to add employee in the job card
2021-07-27 18:43:20 +05:30
Nabin Hait
11a1610781
Merge pull request #26661 from deepeshgarg007/tds_enhancements
...
feat: Enhancements in Tax Withholding Category
2021-07-27 18:26:00 +05:30
Frappe PR Bot
b122a1eaa0
fix: reload manufacturing setting before patch ( #26641 ) ( #26670 )
...
(cherry picked from commit c8d7a8c781
2021-07-27 16:59:06 +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
f28595cad0
Merge pull request #26650 from deepeshgarg007/exchange_rate_reval_fixes_v13
...
fix: Exchange rate revaluation posting date and precision fixes
2021-07-27 16:41:23 +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
6e6823c3aa
feat: Enhancements in TDS
2021-07-27 10:59:25 +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
3fae0db8d9
Merge pull request #26550 from nemesis189/ignore-mandatory-in-payment-reconcilitation-v13
...
fix: Ignore mandatory fields while creating payment reconciliation Journal Entry
2021-07-27 10:15:39 +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
Deepesh Garg
2922fb52cc
Merge pull request #26616 from deepeshgarg007/gst_sales_register_fix
...
fix(India): Default value for export type
2021-07-27 10:12:02 +05:30
Anupam Kumar
34353df48c
fix: sales pipeline graph issue ( #26626 )
2021-07-27 09:47:44 +05:30
Jannat Patel
6c48a2ed79
fix: Removed set_status after cancel from Expense Claim and Employee Advance ( #25901 )
...
* fix: removed set_status after cancel from hr doctypes
* fix: semgrep on_submit issue
* fix: sider
* fix: spaces
* fix: update flag for db_set
2021-07-27 09:41:55 +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
Jannat Patel
aaea5edbdb
fix: Salary component account filter ( #26605 )
...
* fix: salary component account filter
* fix: cleanup
2021-07-27 09:39:33 +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
23776600f3
Merge pull request #26544 from deepeshgarg007/gstr_3b_missing_cess
...
fix: Add missing cess amount in GSTR-3B report
2021-07-26 19:20:42 +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
6330318381
Merge pull request #26575 from deepeshgarg007/gst_reports_timeout
...
fix: GST Reports timeout issue
2021-07-26 19:19:16 +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
dc2cd35b93
fix: Convert null values to empty string on grouping
2021-07-26 19:07:02 +05:30
Deepesh Garg
5749e52bf6
fix: Ignore GL Entry on cancel
2021-07-26 19:06:51 +05:30
Deepesh Garg
fb72df7dce
fix: Exchange rate revaluation posting date and precision fixes
2021-07-26 19:06:40 +05:30
Deepesh Garg
b23315a7e6
Merge branch 'develop' into exchange_rate_reval_fixes
2021-07-26 19:05:44 +05:30
Deepesh Garg
8d52a22709
fix: Additional discount calculations in Invoices ( #26553 )
...
* fix: Additional discount calculations in Invoices
* revert: Client side handling for Dynamic GST Rates
* fix: Add update item tax template method back
* fix: Revert refresh field
* fix: add company change trigger
2021-07-26 19:00:57 +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
Deepesh Garg
d066eab6cd
fix: Test case for GSTR-3b report
2021-07-26 18:38:50 +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
0011585415
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into gst_sales_register_fix
2021-07-26 17:21:13 +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
Subin Tom
06fb0b93b5
fix: Supplier invoice importer fix v13 ( #26633 )
...
* fix: Supplier Invoice Importer fix
Co-authored-by: Subin Tom <subin-home@Subins-MacBook-Air.local>
2021-07-26 16:46:47 +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
Frappe PR Bot
4209b3bda9
fix: included company in Link Document Type filters for contact ( #26576 ) ( #26634 )
...
(cherry picked from commit cbddedab7b
2021-07-26 13:00:32 +05:30
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
Rucha Mahabal
c676eaae57
fix: test
2021-07-25 23:11:18 +05:30
Rucha Mahabal
6bca87ddb9
fix: remove unnecessary imports
2021-07-25 21:34:51 +05:30
Deepesh Garg
67273b9551
fix: Convert null values to empty string on grouping
2021-07-25 21:26:22 +05:30
Rucha Mahabal
475d856d66
fix(style): longer titles overflowing
2021-07-25 20:39:51 +05:30
Rucha Mahabal
37198159aa
feat: Export chart option in desktop view
2021-07-25 20:28:01 +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
Deepesh Garg
328444b530
fix(India): Default value for export type
2021-07-23 20:28:02 +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
Deepesh Garg
2ff0d3e0eb
fix: Test Cases
2021-07-22 10:43:16 +05:30
GangaManoj
4323f4bcac
fix: Modify set_payment_schedule() to include fetch_payment_terms_from_order()
2021-07-22 05:57:42 +05:30
Rucha Mahabal
1176761757
feat: Expand All nodes option in Desktop view
2021-07-21 23:19:47 +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
Deepesh Garg
c765073c2a
fix: Tests
2021-07-21 22:28:32 +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
Deepesh Garg
5a06019440
fix: GL For taxes if discount applied on Grand Total
2021-07-21 15:25:40 +05:30
Deepesh Garg
fc09d845c5
fix: Syntax Error
2021-07-21 15:25:09 +05:30
Deepesh Garg
55325ef3a3
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into discount_accounting_v13
2021-07-21 14:27:05 +05:30
GangaManoj
4fa409e019
fix: Add mandatory_depends_on property for Discount Account
2021-07-21 14:26:52 +05:30
GangaManoj
45327e04db
fix: Tests
2021-07-21 14:26:52 +05:30
GangaManoj
1f6c05f013
fix: Make discount_account mandatory if discount accounting is enabled
2021-07-21 14:26:52 +05:30
GangaManoj
566e8f8499
fix: Create GL Entries for Additional Discount Account
2021-07-21 14:26:51 +05:30
Ganga Manoj
ed6ebdf5ed
fix: Filter for additional_discount_account
...
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2021-07-21 14:24:21 +05:30
Ganga Manoj
821b75f1b1
fix: Filter for additional_discount_account
...
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2021-07-21 14:24:21 +05:30
Ganga Manoj
f421dc7ca7
fix: GL Entry creation
...
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2021-07-21 14:24:21 +05:30
Ganga Manoj
e7e9bda123
fix: Use the item's project instead of the invoice's
...
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2021-07-21 14:24:21 +05:30
Ganga Manoj
b4a8bc8e4c
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-21 14:24:21 +05:30
GangaManoj
251f229601
fix: Add test for additional discount applied on taxes
2021-07-21 14:23:53 +05:30
GangaManoj
99cb89f449
fix: Switch debit and credit for ledger entries for discount applied on taxes for Purchase Invoice
2021-07-21 14:23:53 +05:30
GangaManoj
99652876d0
fix: Add test for additional discount applied on taxes
2021-07-21 14:23:53 +05:30
GangaManoj
d62af77ca8
fix: Remove unnecessary condition
2021-07-21 14:23:52 +05:30
GangaManoj
4da7c5882b
fix: Only display Additional Discount Account if Enable Discount Accounting is checked
2021-07-21 14:23:52 +05:30
GangaManoj
9dd2a9e897
fix: Create ledger entries for discount applied on taxes in make_tax_gl_entries
2021-07-21 14:23:52 +05:30
GangaManoj
ff25683378
fix: Filter options for Additional Discount Account
2021-07-21 14:23:52 +05:30
GangaManoj
03f2706971
fix: Add Additional Discount Account field
2021-07-21 14:23:52 +05:30
GangaManoj
d0d9e83ad2
fix: Check all expected GL Entries
2021-07-21 14:23:52 +05:30
GangaManoj
d6f409addc
fix: Sider issues
2021-07-21 14:23:52 +05:30
GangaManoj
38327fc177
fix: Make additional GL Entries for discount applied on taxes
2021-07-21 14:23:52 +05:30
GangaManoj
b64787ee9c
fix: Only display Additional Discount Account if Enable Discount Accounting is checked
2021-07-21 14:23:52 +05:30
GangaManoj
c1d65cfa8d
fix: Filter options for Additional Discount Account
2021-07-21 14:23:52 +05:30
GangaManoj
9e788cfdcd
fix: Add Additional Discount Account field
2021-07-21 14:23:52 +05:30
GangaManoj
38e87fce09
fix: Add tests for discount accounting
2021-07-21 14:23:51 +05:30
GangaManoj
fd2852e87e
fix: Create common function for discount accounting
2021-07-21 14:23:15 +05:30
GangaManoj
e06eb8e6a9
fix: Filter options for Discount Account
2021-07-21 14:22:26 +05:30
GangaManoj
377775ad8e
fix: Copy Discount Account from first row
2021-07-21 14:22:25 +05:30
GangaManoj
e2c83c3baf
fix: Display Discount Account only if Enable Discount Accounting is checked
2021-07-21 14:21:32 +05:30
GangaManoj
bde5c619db
fix: Add Discount Account field
2021-07-21 14:21:31 +05:30
GangaManoj
ee025b501f
fix: Filter options for Default Discount Account
2021-07-21 14:21:16 +05:30
GangaManoj
546c8d125c
fix: Move Default Discount Account field to Item Defaults
2021-07-21 14:21:16 +05:30
GangaManoj
613d08faad
fix: Copy discount account from first row to all Items
2021-07-21 14:21:15 +05:30
GangaManoj
cfb94175a2
fix: Filter Discount Account list
2021-07-21 14:20:32 +05:30
GangaManoj
d24b5f707a
fix: Add description for Enable Discount Accounting checkbox
2021-07-21 14:20:32 +05:30
GangaManoj
f48fa2e7f3
feat: Toggle display for discount accounting fields according to enable_discount_accounting
2021-07-21 14:20:06 +05:30
GangaManoj
cdfefa261e
feat: Assign Item's Default Discount Account if present
2021-07-21 14:20:06 +05:30
GangaManoj
acb9e207ec
feat: Add Default Discount Account field
2021-07-21 14:20:06 +05:30
GangaManoj
c4e5429560
feat: Filter list for Discount Account field in Items table
2021-07-21 14:20:06 +05:30
GangaManoj
f6a9374356
feat: Create GL Entries for discount accounting
2021-07-21 14:20:06 +05:30
GangaManoj
a6690a8a3d
feat(Sales Invoice): Add 'Discount Account' field in Items table
2021-07-21 14:20:06 +05:30
GangaManoj
e1dc6980d0
feat(Accounts Settings): Add 'Enable Discount Accounting' checkbox
2021-07-21 14:20:06 +05:30
Deepesh Garg
8a64a84d1a
fix: GST Reports timeout issue
2021-07-21 13:25:53 +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
Rucha Mahabal
89c5bb6066
fix: tests
2021-07-19 22:19:28 +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
ff9d631f15
fix:Ignore mandatory fields while creating payment reconciliation Journal Entry
2021-07-19 20:28:34 +05:30
Subin Tom
b24a149dbc
test: Updated test case for Eway bill
2021-07-19 14:37:12 +05:30
Deepesh Garg
cad1170782
fix: Add missing cess amount in GSTR-3B report
2021-07-19 14:36:54 +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
56cdcebbf4
fix: Sider issues
2021-07-16 02:23:55 +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
Rucha Mahabal
8961a267f6
fix: sider
2021-07-15 19:32:15 +05:30
Rucha Mahabal
ee7eaf9c70
test: UI tests for org chart mobile
...
fix(mobile): detach node before emptying hierarchy
fix(mobile): sibling group not rendering for first level
2021-07-15 19:19:09 +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
Rucha Mahabal
f004b404d1
test: UI tests for org chart desktop
2021-07-14 23:50:54 +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
Saqib
59bf2df28e
fix: pos item cart dom updates ( #26461 )
2021-07-14 11:40:58 +05:30
Saqib
cbf7e1b676
fix: pos item cart dom updates ( #26460 )
2021-07-14 11:40:47 +05:30
Anurag Mishra
adfdc71844
fix: Tax calculation for Recurring additional salary ( #24206 )
...
* fix: Tax calculation for Recurring additional salary
* fix: conflicts
2021-07-14 09:59:41 +05:30
rohitwaghchaure
96eb147bb6
Merge pull request #26457 from rohitwaghchaure/fixed-multi-currency-issue
...
fix: multi-currency issue
2021-07-13 23:01:30 +05:30
GangaManoj
6357ffe4a1
fix: Create asset data
2021-07-13 22:31:01 +05:30
Deepesh Garg
7ff6865817
Merge pull request #26470 from deepeshgarg007/new_company_error_v13
...
fix: Errors on parallel requests creation of company for India
2021-07-13 20:30:06 +05:30
Deepesh Garg
75f66f78d7
Merge pull request #26420 from deepeshgarg007/new_company_error
...
fix: Errors on parallel requests creation of company for India
2021-07-13 20:29:56 +05:30
GangaManoj
2f4c607fc8
fix: Add tests for discount accounting
2021-07-13 17:41:29 +05:30
Deepesh Garg
3b68735e25
Merge branch 'develop' into payment_entry_taxes_unallocated_amount
2021-07-13 17:33:06 +05:30
Deepesh Garg
1ee63f31e5
Merge branch 'develop' of https://github.com/frappe/erpnext into bootstrapped_gst_setup_develop
2021-07-13 16:51:47 +05:30
Deepesh Garg
2de11fbbc4
fix: Test Cases
2021-07-13 16:50:35 +05:30
Deepesh Garg
3ef394c556
fix: Test cases
2021-07-13 16:50:35 +05:30
Deepesh Garg
b2af6b4583
fix: Create mode of payment if doesn't exists
2021-07-13 16:50:35 +05:30
Deepesh Garg
8f6f86aff4
fix: Test cases for M-pesa
2021-07-13 16:50:35 +05:30
Deepesh Garg
779d2afa60
fix: Update account heads in GST test cases
2021-07-13 16:50:04 +05:30
Deepesh Garg
bb679cc036
fix: Add validate bank account method back
2021-07-13 16:49:21 +05:30
Deepesh Garg
2908f2ee20
fix: Revert Changes
2021-07-13 16:49:21 +05:30
Deepesh Garg
0dfea4d134
fix: Test Cases
2021-07-13 16:49:21 +05:30
Deepesh Garg
22683cf19b
fix: Tests
2021-07-13 16:49:21 +05:30
Deepesh Garg
b71497067d
chore: Add comments
2021-07-13 16:49:21 +05:30
Deepesh Garg
87f4df80ea
fix: Move tax categories up in country wise json
2021-07-13 16:49:21 +05:30
Deepesh Garg
ed54e4e276
fix: Check for tax category
2021-07-13 16:48:44 +05:30
Deepesh Garg
269510b98f
fix: Regional settings setup
2021-07-13 16:48:22 +05:30
Deepesh Garg
a72589cb7e
fix: Add accounts and templates for reverse charge
2021-07-13 16:48:06 +05:30
Deepesh Garg
0380cca3b7
fix: Add GST accounts to GST Settings
2021-07-13 16:47:38 +05:30
Deepesh Garg
96300fa791
fix: Add validation for GST Settings
2021-07-13 16:47:38 +05:30
Deepesh Garg
1001f29784
fix: Gracefully handle duplicate bank account name to make setup faster
2021-07-13 16:47:38 +05:30
Deepesh Garg
8ed1afd93d
fix: Remove redundant get_doc
2021-07-13 16:47:38 +05:30
Deepesh Garg
8fd2d8b5d0
fix: Ignore validations for Tax Setup
2021-07-13 16:47:38 +05:30
Deepesh Garg
a90e5fd2e1
fix: Issues on new company setup
2021-07-13 16:47:38 +05:30
Deepesh Garg
e166c264b4
fix: Update country-wise-tax JSON and tax setup
2021-07-13 16:47:38 +05:30
Deepesh Garg
3031535a24
fix: Add tax categories on company setup
2021-07-13 16:47:36 +05:30
Deepesh Garg
de8c6eb0da
fix: Item Tax templates for GST
2021-07-13 16:46:30 +05:30
Deepesh Garg
2a9726b09f
feat(India): Separate Input and Output GST tax accounts
2021-07-13 16:46:30 +05:30
Deepesh Garg
c00d851a88
fix: Unallocated amount for inclusive charges
2021-07-13 16:42:21 +05:30
Deepesh Garg
740d5c6c53
fix: Deduct included taxes from unallocated amount
2021-07-13 16:42:10 +05:30
Deepesh Garg
01c89eaad9
fix: Remove unintentional changes
2021-07-13 16:42:10 +05:30
Deepesh Garg
2f350bf450
fix: Remove unintentional changes
2021-07-13 16:42:10 +05:30
Deepesh Garg
9513d61a50
fix: Hide amount after tax fields
2021-07-13 16:42:10 +05:30
Deepesh Garg
51ae46f0de
fix: Unallocated amount in Payment Entry after taxes
2021-07-13 16:42:10 +05:30
Deepesh Garg
4478c547bf
fix: Unallocated amount for inclusive charges
2021-07-13 16:35:58 +05:30
Deepesh Garg
754f432d97
fix: Deduct included taxes from unallocated amount
2021-07-13 16:35:47 +05:30
Deepesh Garg
7c634f66ca
fix: Remove unintentional changes
2021-07-13 16:35:47 +05:30
Deepesh Garg
5179f85e63
fix: Remove unintentional changes
2021-07-13 16:35:47 +05:30
Deepesh Garg
5cc4a201cb
fix: Hide amount after tax fields
2021-07-13 16:35:47 +05:30
Deepesh Garg
f661d82c00
fix: Unallocated amount in Payment Entry after taxes
2021-07-13 16:35:47 +05:30
Deepesh Garg
2f89b5b38e
Merge pull request #26466 from deepeshgarg007/amended_doc_discount_v13
...
fix: Incorrect discount amount on amended document
2021-07-13 16:24:54 +05:30
Deepesh Garg
41c5357602
Merge pull request #26468 from deepeshgarg007/gstr_1_json_dpwnload_error_v13
...
fix: Unable to download GSTR-1 json
2021-07-13 16:17:52 +05:30
Deepesh Garg
fc20ff02d0
Merge pull request #26418 from deepeshgarg007/gstr_1_json_dpwnload_error
...
fix: Unable to download GSTR-1 json
2021-07-13 16:17:37 +05:30
rohitwaghchaure
bd8699b8a9
Merge pull request #26458 from rohitwaghchaure/fixed-multi-currency-issue-pre
...
fix: multi-currency issue
2021-07-13 16:05:36 +05:30
Deepesh Garg
fea29ae8cb
fix: Use update flag for company dependant fixtures
2021-07-13 16:05:05 +05:30
Deepesh Garg
7be9f8dab1
fix: Error on creation of company for India
2021-07-13 16:04:56 +05:30
Deepesh Garg
0bad696faf
fix: Unable to download GSTR-1 json
2021-07-13 15:46:58 +05:30
Deepesh Garg
fc9714b871
fix: Unable to download GSTR-1 json
2021-07-13 15:45:34 +05:30
Deepesh Garg
07d9f3f74b
fix: Incorrect discount amount on amended document
2021-07-13 15:35:59 +05:30
Rohit Waghchaure
4acbeecbbe
fix: multi-currency issue
2021-07-13 15:35:30 +05:30
Deepesh Garg
a5200d6a43
Merge pull request #26429 from deepeshgarg007/amended_doc_discount_develop
...
fix: Incorrect discount amount on amended document
2021-07-13 15:34:32 +05:30
18alantom
a4eba7a409
fix: show child item group items on portal
2021-07-13 15:34:25 +05:30
Deepesh Garg
eef8e4a9d4
Merge pull request #26292 from deepeshgarg007/amended_doc_discount
...
fix: Incorrect discount amount on amended document
2021-07-13 15:34:24 +05:30
Rohit Waghchaure
0d190bb930
fix: multi-currency issue
2021-07-13 15:32:39 +05:30
Subin Tom
5265ba39f0
feat: Added fields for dispatch address in Sales Order, Sales Invoice, Delivery Note for Eway Bill
2021-07-13 14:58:17 +05:30
Saqib
621927d9f9
fix: move the rename abbreviation job to long queue ( #26462 )
2021-07-13 14:13:39 +05:30
Saqib
7c5711ddf4
fix: pos item cart dom updates ( #26459 )
2021-07-13 14:09:06 +05:30
Rucha Mahabal
fc4079587b
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into org-chart
2021-07-13 12:38:37 +05:30
Anupam Kumar
a8b6cf8114
fix: bank remittance report issue ( #26398 )
2021-07-13 11:45:34 +05:30
rohitwaghchaure
84f23ac8d2
Merge pull request #26222 from 18alantom/teabox-cogs-by-item-group
...
feat: report to show cogs by item groups
2021-07-13 11:24:59 +05:30
Deepesh Garg
4a2e4748ac
fix: Unallocated amount for inclusive charges
2021-07-13 11:22:55 +05:30
Noah Jacob
74b3fc1e1c
refactor: suggested changes
2021-07-13 11:05:53 +05:30
Noah Jacob
1e8f598ba5
fix: Sider
2021-07-13 11:05:53 +05:30
Noah Jacob
dd0a8f20e2
test: updated test cases
2021-07-13 11:05:53 +05:30
Noah Jacob
fedee0e8da
test: test cases for fetching customer group details
2021-07-13 11:05:53 +05:30
Noah Jacob
f07f7e9305
test: test case for fetching supplier group details
2021-07-13 11:05:53 +05:30
Noah Jacob
1cb2af00a8
feat: details fetched from customer group in customer
2021-07-13 11:05:53 +05:30
Noah Jacob
9965af166e
feat: details fetched from supplier group in supplier
2021-07-13 11:05:53 +05:30
Marica
73c9a21987
Merge branch 'develop' into supplier_defaults_fix
2021-07-13 10:31:10 +05:30
GangaManoj
8f7b0a1753
fix: Create common function for discount accounting
2021-07-13 03:01:02 +05:30
GangaManoj
65e2b9fee6
fix: Filter options for Discount Account
2021-07-13 02:14:18 +05:30
GangaManoj
81375aec1f
fix: Copy Discount Account from first row
2021-07-13 02:09:40 +05:30
GangaManoj
4b8918e8a7
fix: Display Discount Account only if Enable Discount Accounting is checked
2021-07-13 02:07:46 +05:30
GangaManoj
555852c5ef
fix: Add Discount Account field
2021-07-13 02:06:03 +05:30
GangaManoj
b85d3017a1
fix: Filter options for Default Discount Account
2021-07-13 01:45:20 +05:30
GangaManoj
0b7d8fb3af
fix: Move Default Discount Account field to Item Defaults
2021-07-13 01:45:20 +05:30
GangaManoj
4fcdc5d129
fix: Copy discount account from first row to all Items
2021-07-13 01:45:20 +05:30
GangaManoj
b22dba1146
fix: Filter Discount Account list
2021-07-13 01:45:20 +05:30
GangaManoj
0d5ad3b1bb
fix: Add description for Enable Discount Accounting checkbox
2021-07-13 01:45:20 +05:30
Deepesh Garg
30f771b26c
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into payment_entry_taxes_v12
2021-07-12 23:34:13 +05:30
Deepesh Garg
855e9030f2
fix: Deduct included taxes from unallocated amount
2021-07-12 22:11:57 +05:30
Saqib
0683337f14
fix: incorrect response by variance & resolution by variance ( #26173 )
2021-07-12 20:21:07 +05:30
Saqib
7fb64d1645
fix: exchange gain loss not set for advances linked with invoices ( #26436 )
2021-07-12 18:33:16 +05:30
Deepesh Garg
1298956482
fix: Use update flag for company dependant fixtures
2021-07-12 18:29:52 +05:30
Nabin Hait
ca6e4bed9f
Merge pull request #26431 from nabinhait/reposting-optimization
...
refactor: Optimized code for reposting item valuation
2021-07-12 15:42:24 +05:30
Nabin Hait
826d2b1e7b
Merge pull request #26433 from nabinhait/reposting-optimization-develop
...
refactor: Optimized code for reposting item valuation
2021-07-12 15:42:14 +05:30
Saqib
a20999cfbc
fix: exchange gain loss not set for advances linked with invoices ( #25369 )
2021-07-12 14:33:23 +05:30
Saqib
b75b556bbb
fix: move the rename abbreviation job to long queue ( #26435 )
2021-07-12 14:32:37 +05:30
Saqib
9e1819d366
fix: move the rename abbreviation job to long queue ( #26434 )
2021-07-12 14:31:57 +05:30
Nabin Hait
97bce3af9a
refactor: Optimized code for reposting item valuation
2021-07-12 13:33:08 +05:30
Nabin Hait
0003938f2b
refactor: Optimized code for reposting item valuation
2021-07-12 13:29:20 +05:30
Nabin Hait
01aada6c90
refactor: Optimized code for reposting item valuation
2021-07-12 13:28:19 +05:30
Nabin Hait
45e6cffa4f
refactor: Optimized code for reposting item valuation
2021-07-12 13:26:08 +05:30
Jannat Patel
b4ea185eca
fix: added company filter while fetching loans ( #26295 )
...
* fix: added company filter while fetching loans
* fix: added set_query in refresh
* fix: quotes
* fix: tests
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-07-12 13:15:41 +05:30
Jannat Patel
38994bd494
fix: Added Company filters for Loan ( #26294 )
...
* fix: loan validations
* fix: added company filter while fetching loans
* fix: tests
2021-07-12 13:01:31 +05:30
rohitwaghchaure
e2c97b1a2b
Merge pull request #26351 from rohitwaghchaure/fixed-putaway-fixing-for-material-receipt-develop
...
fix: stock entry with putaway rule not working
2021-07-12 12:49:25 +05:30
Nabin Hait
470c7e773f
fix: merge conflict
2021-07-12 12:45:49 +05:30
Deepesh Garg
4ff98cc171
fix: Incorrect discount amount on amended document
2021-07-12 11:27:28 +05:30
Afshan
7e05bea6a9
fix: dunning calculation of grand total when rate of interest is 0% ( #26286 )
2021-07-12 11:11:58 +05:30
Afshan
10473b1195
fix: dunning calculation of grand total when rate of interest is 0% ( #26285 )
2021-07-12 11:11:29 +05:30
Afshan
bf03671a33
fix(report): iterate on accounts only when accounts exist ( #26391 )
2021-07-12 11:10:28 +05:30
Afshan
4b4ac7c051
fix(report): iterate on accounts only when accounts exist ( #26390 )
2021-07-12 11:10:00 +05:30
Afshan
f60c3f0655
fix: error popup for COA errors ( #26358 )
2021-07-12 11:07:30 +05:30
Afshan
6467632f60
fix: error popup for COA errors ( #26357 )
2021-07-12 11:07:06 +05:30
Saqib
432d8efa3d
fix(pos): taxes amount in pos item cart ( #26411 )
2021-07-12 10:47:40 +05:30
Ankush
caacd0ad2c
fix: stock levels disapperaing on refresh (bp #26305 )
...
refresh_section removes all sections with `custom` class, added
different class to avoid this behaviour.
# Conflicts:
# erpnext/stock/doctype/item/item.js
2021-07-12 10:20:19 +05:30
Ankush Menat
22cb642831
chore: update test company FY
2021-07-12 10:09:50 +05:30
Ankush Menat
b99469cdab
fix: stock levels disapperaing on refresh
...
refresh_section removes all sections with `custom` class, added
different class to avoid this behaviour.
2021-07-12 10:09:50 +05:30
Noah Jacob
0be6583083
refactor: suggested changes
2021-07-12 09:18:19 +05:30
Noah Jacob
34a5cb9106
fix: Sider
2021-07-12 08:48:04 +05:30
Marica
f7748e4109
Merge pull request #26133 from marination/qi-rejection
...
feat: Optionally allow rejected quality inspection on submission
2021-07-10 21:04:32 +05:30
marination
f67f13c384
chore: Test case for QI Rejection in Stock Entry
...
- Use `get_single_value` instead of `get_doc` in validation
- Test Case to check impact of stock settings on SE with rejected qi
2021-07-10 21:02:36 +05:30
Marica
9ba3fce4fd
fix: Consistent alert indicators
2021-07-10 21:02:28 +05:30
marination
654e9d85d1
fix: sider and semgrep
2021-07-10 21:02:19 +05:30
marination
9ac9a4ef21
feat: Optionally allow rejected quality inspection on submission
2021-07-10 21:02:03 +05:30
Deepesh Garg
e282effaed
fix: Error on creation of company for India
2021-07-10 20:23:52 +05:30
marination
c8a825c478
chore: Test case for QI Rejection in Stock Entry
...
- Use `get_single_value` instead of `get_doc` in validation
- Test Case to check impact of stock settings on SE with rejected qi
2021-07-10 18:26:36 +05:30
Deepesh Garg
77f2d2d01e
fix: Unable to download GSTR-1 json
2021-07-10 10:06:38 +05:30
Saqib
2e507b47a8
fix(Asset Repair): cancellation
2021-07-09 22:39:34 +05:30
GangaManoj
073b50f7fd
fix(Asset Repair): Rearrange fields
2021-07-09 22:38:58 +05:30
GangaManoj
fd7fb37697
fix(Asset Repair): Simplify code for Asset Repair creation in tests
2021-07-09 22:38:58 +05:30
GangaManoj
e328e3b48a
fix(Asset Repair): Edit description for total_repair_cost
2021-07-09 22:38:57 +05:30
GangaManoj
c8caafa680
fix(Asset Repair): Move filters for cost_center, warehouse and project to setup
2021-07-09 22:38:57 +05:30
GangaManoj
267fed2d23
fix(Asset): Add comment
2021-07-09 22:38:57 +05:30
GangaManoj
597016bb34
fix(Asset): Remove extra tabs
2021-07-09 22:38:57 +05:30
GangaManoj
7c37e83535
fix(Asset): Remove to_date field
2021-07-09 22:38:57 +05:30
GangaManoj
cba0966ec5
fix(Asset Repair): Change controller hooks
2021-07-09 22:38:57 +05:30
GangaManoj
81bcae7433
fix(Asset): Remove redundant code
2021-07-09 22:38:57 +05:30
GangaManoj
f3ae1dd23b
fix(Asset): Fix test
2021-07-09 22:38:57 +05:30
GangaManoj
18bbfdf343
fix(Asset Repair): Remove test that's no longer necessary
2021-07-09 22:38:56 +05:30
GangaManoj
39dba43b87
fix(Asset): Fix value_after_depreciation calculation
2021-07-09 22:38:56 +05:30
GangaManoj
3ba9fb32de
fix(Asset Repair): Replace asset_value with value_after_depreciation in tests
2021-07-09 22:38:56 +05:30
GangaManoj
72ea64f6ac
fix: Sider issues
2021-07-09 22:38:49 +05:30
GangaManoj
307fe43e08
fix: Remove changes made to Asset Maintenance
2021-07-09 22:38:02 +05:30
GangaManoj
55bca4cbc7
fix(Asset Repair): Revert Stock Entry on cancellation
2021-07-09 22:38:02 +05:30
GangaManoj
c34e6b1889
fix(Asset): Fix tests for Asset Repair
2021-07-09 22:38:02 +05:30
GangaManoj
ba9558527d
fix(Asset Repair): Return Depreciation Schedule to original state on cancellation
2021-07-09 22:37:08 +05:30
GangaManoj
6c2f4ce6a5
fix(Asset Repair): Increase stock quantity and decrease asset value on cancellation
2021-07-09 22:37:08 +05:30
GangaManoj
ad78888c86
fix(Asset Repair): Compute total_value instantly
2021-07-09 22:37:08 +05:30
GangaManoj
e921878633
fix: Rename 'Stock Item' to 'Asset Repair Consumed Item'
2021-07-09 22:37:08 +05:30
GangaManoj
852881e33e
fix(Asset Repair): Fix tests
2021-07-09 22:37:04 +05:30
GangaManoj
42fd7ffbc0
fix(Asset Repair): Set completion_date on changing repair_status to 'Completed'
2021-07-09 22:36:05 +05:30
GangaManoj
68e0c96c03
fix(Asset Repair): Prevent some fields from being copied on duplicating the doc
2021-07-09 22:36:05 +05:30
GangaManoj
399d17e40e
fix(Asset Repair): Make Error Description non-mandatory
2021-07-09 22:36:05 +05:30
GangaManoj
e755c74a60
fix(Asset Repair): Add Stock Entry field
2021-07-09 22:36:04 +05:30
GangaManoj
4004bcd436
fix(Asset Repair): Move Total Repair Cost to the Stock Consumption Details section
2021-07-09 22:36:04 +05:30
GangaManoj
bd1796cbb6
fix: Replace edit_dates with flags.increase_in_asset_life
2021-07-09 22:36:04 +05:30
GangaManoj
ae8cb335b6
fix(Asset Repair): Fix depreciation_amount calculation
2021-07-09 22:36:04 +05:30
GangaManoj
be536040df
fix: Add comments
2021-07-09 22:36:04 +05:30
GangaManoj
bd336c7d8e
fix(Asset): Add function to clear old depreciation schedule
2021-07-09 22:36:04 +05:30
GangaManoj
54cbc8324a
fix(Asset Repair): Create GL Entries for each item in Stock Items
2021-07-09 22:36:04 +05:30
GangaManoj
50826f16ee
fix(Asset): Replace asset_value with value_after_depreciation in Finance Books
2021-07-09 22:36:04 +05:30
GangaManoj
d354a301cb
fix(Asset Repair): Display value_after_depreciation in Finance Books
2021-07-09 22:36:04 +05:30
GangaManoj
9520efb941
fix(Asset Repair): Filter Warehouse by Company
2021-07-09 22:36:03 +05:30
GangaManoj
96de4fdf1f
fix(Asset Repair): Fix GL Entry creation
2021-07-09 22:36:03 +05:30
GangaManoj
71eaf3dbd8
fix(Asset Repair): Fix Sider issues
2021-07-09 22:36:03 +05:30
GangaManoj
75fbda10ad
fix(Asset Repair): Make Cost Center non-mandatory
2021-07-09 22:36:03 +05:30
GangaManoj
0aaf88cc0a
fix(Asset Repair): Uncheck allow_on_submit for all fields
2021-07-09 22:36:03 +05:30
GangaManoj
9779aa11fb
fix(Asset Repair): Use existing function from asset.py for fetching fixed_asset_account
2021-07-09 22:36:03 +05:30
GangaManoj
aff9709525
fix(Asset Repair): Add mandatory_depends_on condition for Purchase Invoice
2021-07-09 22:36:03 +05:30
GangaManoj
17fa121779
fix(Asset Repair): Filter Cost Center and Project by Company
2021-07-09 22:36:03 +05:30
GangaManoj
867fd02b2d
fix(Asset Repair): Add Company field
2021-07-09 22:36:03 +05:30
