Commit Graph

37729 Commits

Author SHA1 Message Date
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
Ankush Menat
5764b49767
fix: remove incorrect field check from reposting 2021-07-29 15:41:22 +05:30
Ankush Menat
c3e739caf8
fix: correct field for GLE against account in PR 2021-07-29 15:34:18 +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
Ankush
e906acdc49
chore: change location of backport action (#26705) 2021-07-29 13:56:21 +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
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
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
47a651a80f fix: removing depends_on for contact fields 2021-07-28 18:21:19 +05:30
rohitwaghchaure
bfd824c56e
Merge pull request #26691 from frappe-pr-bot/backport/version-13-pre-release/26689
fix(bom): remove manual permission checking
2021-07-28 18:01:58 +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
Anuja
4571fb6635 Merge remote-tracking branch 'origin/sa-vat-report' into sa-vat-report 2021-07-28 15:44:19 +05:30
Sagar Vora
70c673d9b0
Merge pull request #26688 from resilient-tech/fix-reference-date
fix: date as reference_date from bank transactions
2021-07-28 15:20:14 +05:30
Marica
d43e6ced91
Merge branch 'develop' into pi-expense-account 2021-07-28 14:38:48 +05:30
walstanb
655b5dc190 fix: date as reference_date from bank transactions 2021-07-28 14:30:11 +05:30
Afshan
42bc0a7db8
fix: documentation link for E Invoicing (#26684) 2021-07-28 13:42:53 +05:30
Afshan
868a6cb26d
fix: documentation link for E Invoicing (#26686) 2021-07-28 13:42:13 +05:30
rohitwaghchaure
36bf5c7ed4
Merge branch 'develop' into mr_allowance_feat 2021-07-28 11:52:57 +05:30
Deepesh Garg
441adf763f fix(minor): Consider grand total for threshold check 2021-07-28 10:51:50 +05:30
Frappe PR Bot
3a39c0f19a
fix: force reload of Opportunity in patch (#26668) (#26681)
(cherry picked from commit ac2e139d5b)

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
Deepesh Garg
5a7fad8a6a feat: Enhancements in TDS 2021-07-27 18:55:14 +05:30
rohitwaghchaure
82d0cfc68e
Merge pull request #26676 from rohitwaghchaure/fixed-dict-object-has-no-attr-pre
fix: not able to add employee in the job card
2021-07-27 18:46:59 +05:30
Rohit Waghchaure
940356d28a fix: not able to add employee in the job card 2021-07-27 18:45:17 +05:30
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
rohitwaghchaure
a07423ebb5
Merge pull request #26672 from frappe-pr-bot/backport/version-13-pre-release/26641
fix: reload manufacturing setting before patch
2021-07-27 17:28:53 +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
Ankush
7a97b6d6a8 fix: reload manufacturing setting before patch (#26641)
(cherry picked from commit c8d7a8c781)
2021-07-27 11:19:33 +00:00
Anupam
ee1089ca4f Merge branch 'develop' of https://github.com/frappe/erpnext into campaign-module 2021-07-27 16:49:24 +05:30
Anupam
f1c697ca75 fix: sider issue 2021-07-27 16:49:04 +05:30
Deepesh Garg
9d8efbe1db
Merge pull request #26651 from deepeshgarg007/exchange_rate_reval_fixes_v13_pre_release
fix: Exchange rate revaluation posting date and precision fixes
2021-07-27 16:41:59 +05:30
Deepesh Garg
3ee61af676
Merge pull request #26628 from deepeshgarg007/exchange_rate_reval_fixes
fix: Exchange rate revaluation posting date and precision fixes
2021-07-27 16:41:04 +05:30
Ankush
c8d7a8c781
fix: reload manufacturing setting before patch (#26641) 2021-07-27 16:39:38 +05:30
Ankush Menat
dfdd1c6e02
feat: don't recompute taxes 2021-07-27 14:49:44 +05:30
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