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
rohitwaghchaure
801ca6528a
Merge pull request #26663 from rohitwaghchaure/develop-fixed-serial-no-not-link-to-batch-error
...
fix: serial no and batch validation
2021-07-27 13:45:37 +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
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
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
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
b23315a7e6
Merge branch 'develop' into exchange_rate_reval_fixes
2021-07-26 19:05:44 +05:30
Jannat Patel
bfec49376d
Merge pull request #26631 from ChillarAnand/co
...
chore: Updated CODEOWNERS
2021-07-26 18:39:13 +05:30
Jannat Patel
16feebf685
Update CODEOWNERS
...
chore: update code owner for education module
2021-07-26 18:17:30 +05:30
Jannat Patel
ebda4d67bd
Merge branch 'develop' into co
2021-07-26 18:14:48 +05:30
Deepesh Garg
19589b1e21
fix: GST Reports timeout issue
2021-07-26 17:05:48 +05:30
Deepesh Garg
00fd319531
fix: Add missing cess amount in GSTR-3B report
2021-07-26 16:52:54 +05:30
Deepesh Garg
4e0664b548
Merge branch 'develop' into supplier-invoice-importer-fix
2021-07-26 16:48:11 +05:30
Noah Jacob
cbddedab7b
fix: included company in Link Document Type filters for contact ( #26576 )
2021-07-26 12:54:35 +05:30
ChillarAnand
2d439f2355
chore: Updated CODEOWNERS
2021-07-26 11:08:31 +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
Ankush
057a0a9842
ci: auto backport squashed commits based on labels ( #26622 )
2021-07-25 12:49:05 +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
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
Nabin Hait
595c7a6e61
fix: merge conflict
2021-07-22 17:11:20 +05:30
Nabin Hait
338f436a1c
Merge branch 'version-13-pre-release' into version-13
2021-07-22 17:05:51 +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
Devin Slauenwhite
0d968fabfe
fix: missing parameter 'country'
2021-07-22 13:44:09 +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
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
Ankush Menat
28d52c4a95
chore: remove warning rules
...
semgrep-action doesn't consider severity, hence ignoring these rules for now.
2021-07-21 19:54:06 +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
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
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
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
Suraj Shetty
47f200a70d
chore: Update stale.yml
...
reduce `daysUntilStale` & `daysUntilClose` to keep the contributors active.
2021-07-20 16:13:49 +05:30
Suraj Shetty
8790248318
Merge pull request #26554 from surajshetty3416/fix-customer-quick-entry
...
fix: Pass doc and other parameters to properly prefill information
2021-07-20 11:39:32 +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
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
Subin Tom
b24a149dbc
test: Updated test case for Eway bill
2021-07-19 14:37:12 +05:30
