Commit Graph

37482 Commits

Author SHA1 Message Date
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
Anupam
c35a526dd8 fix: adding test cases 2021-08-05 14:42:15 +05:30
Anupam
2732490cbe fix: review changes 2021-08-05 00:30:01 +05:30
Anupam
a6ce1244a0 fix: sider issues 2021-07-29 10:43:21 +05:30
Anupam
47a651a80f fix: removing depends_on for contact fields 2021-07-28 18:21:19 +05:30
Anupam
49cfac0ef0 feat: added basic info. of lead in header part 2021-07-28 17:51:35 +05:30
Anupam
f4f0dde838 feat: unlinking dynamic links on trash 2021-07-28 16:16:52 +05:30
Frappe PR Bot
3a39c0f19a
fix: force reload of Opportunity in patch (#26668) (#26681)
(cherry picked from commit ac2e139d5b)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
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
Jannat Patel
1ec7ccd749
Merge pull request #26272 from anupamvs/campaign-module
fix: moving campaign from selling to CRM
2021-07-27 17:34:31 +05:30
Anupam
6a89b9e267 Merge branch 'campaign-module' of https://github.com/anupamvs/erpnext into campaign-module 2021-07-27 16:53:08 +05:30
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
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