Ankush Menat
dfdd1c6e02
feat: don't recompute taxes
2021-07-27 14:49:44 +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
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
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
93dd238577
Merge pull request #26646 from deepeshgarg007/gst_reports_timeout_v13
...
fix: GST Reports timeout issue
2021-07-26 19:19:34 +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
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
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
rohitwaghchaure
f3ae7584c5
Merge pull request #26635 from frappe-pr-bot/backport/version-13-pre-release/26576
...
fix: included company in link document type filters for contact
2021-07-26 13:08:33 +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
rohitwaghchaure
7aa802a073
Merge pull request #26632 from rohitwaghchaure/merging-13-hotfix-to-13-pre-release-13-8
...
chore: Merging Version 13 hotfix to 13 Pre Release
2021-07-26 12:43:16 +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
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
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
