Rohit Waghchaure
9f13a060f0
fix: reposting patch
2021-02-26 17:44:54 +05:30
Rohit Waghchaure
c603fd638b
fix: reposting patch
2021-02-26 17:42:52 +05:30
Saqib
3dfa017f1d
refactor: (coa importer) create coa tree with account no & account name ( #23601 )
2021-02-26 16:50:22 +05:30
Saqib
2a1b1537f9
fix(pos): rounded total and search fixes ( #24738 )
2021-02-26 16:49:28 +05:30
Daniel Chalmers
9803835436
Add "description" field to Skill doctype
...
Lets us describe a skill past just the title. Closes #23592
2021-02-26 00:33:48 -06:00
Deepesh Garg
28ca4ec79d
Merge branch 'develop' into fix_create_item_tax_with_salespurchasetax
2021-02-26 10:43:15 +05:30
Deepesh Garg
f8a7e000f5
Merge pull request #24746 from deepeshgarg007/unique_remove
...
fix: Remove unique check from represents company field
2021-02-25 22:41:22 +05:30
Deepesh Garg
27da2bb63a
fix: Remove unique check from represents company field
2021-02-25 22:39:47 +05:30
Ankush Menat
027db0b41e
fix(HR): hide "more" button from team updates
2021-02-25 21:29:00 +05:30
Deepesh Garg
b85fb0c3a4
Merge branch 'develop' into rounding_issue_fix
2021-02-25 20:17:35 +05:30
Ankush Menat
dca307e7cc
feat: track changes to HR settings ( #24739 )
...
related issue: FR-ISS-259927
2021-02-25 19:05:07 +05:30
Syed Mujeer Hashmi
286e00bdf2
fix: Fetch Task subject from Task ( #24729 )
2021-02-25 19:02:54 +05:30
Afshan
1be997beb4
fix: reference variable in pricing rule ( #24711 )
2021-02-25 19:01:32 +05:30
Deepesh Garg
2d0b277ce0
Merge pull request #24054 from gwhitney/other_app_acc_dims
...
feat(Accounting Dimension): accounting dimension doctypes for other apps
2021-02-25 18:48:42 +05:30
Anurag Mishra
02f50a93e5
fix: copy variants property and Attributes whil duplicatinh item Tamplate ( #24662 )
2021-02-25 18:47:17 +05:30
Anuja Pawar
118a4ffb08
fix: rounding error in finished goods qty ( #24653 )
2021-02-25 18:44:44 +05:30
Mohammad Hasnain Mohsin Rajan
8cdba8ab64
fix: ams integration breaks when error raised ( #24383 )
2021-02-25 18:36:19 +05:30
Deepesh Garg
6af3c3fa2a
Merge pull request #24722 from danielchalmers/patch-1
...
fix: Allow renaming skills
2021-02-25 15:44:44 +05:30
Deepesh Garg
2e320cfdc3
Merge pull request #24588 from deepeshgarg007/subscription_fix_new
...
fix: Multiple fixes in subscription
2021-02-25 15:41:51 +05:30
Deepesh Garg
7a837170ea
Merge branch 'develop' of https://github.com/frappe/erpnext into other_app_acc_dims
2021-02-25 15:41:03 +05:30
Deepesh Garg
b990e71b4c
fix: Add search field in project query
2021-02-25 14:01:22 +05:30
Deepesh Garg
834a8b740d
Merge branch 'develop' into subscription_fix_new
2021-02-25 11:24:27 +05:30
Deepesh Garg
409c37ebeb
Merge pull request #24723 from ankush/opening_round_gl
...
fix: make round off GLE always non-opening
2021-02-25 09:04:45 +05:30
Ankush Menat
325a461c34
Merge branch 'develop' into opening_round_gl
2021-02-25 07:53:48 +05:30
Daniel Chalmers
d3e122259d
Update skill.json
2021-02-24 17:13:48 -06:00
Florian HENRY
e11ce57f3c
fix: add item taxes at the same times as sales and purchase taxes
2021-02-24 21:45:29 +01:00
Afshan
684fc4e27b
fix: asset category name disappear ( #24728 )
2021-02-24 19:08:56 +05:30
Afshan
6bd2bbc953
fix: show custom button for saved projects ( #24730 )
...
* fix: show custom button for saved projects
* fix: slider
2021-02-24 18:13:10 +05:30
rohitwaghchaure
d0baa90b50
Merge pull request #24715 from rohitwaghchaure/fixed-patch-item-reposting-develop
...
fix: patch failing because of incorrect gl entries
2021-02-24 17:18:43 +05:30
Afshan
84184559bc
fix: currency symbol in update items ( #24726 )
2021-02-24 16:51:11 +05:30
Saurabh
d713ac4505
Merge branch 'version-13-beta-pre-release' into version-13-beta
2021-02-24 15:01:19 +05:30
Saurabh
fefacced13
bumped to version 13.0.0-beta.12
2021-02-24 15:21:19 +05:50
Shariq Ansari
1dba7d2161
fix: Added parent task expected end date validation ( #24611 )
...
* fix: Added parent task expected end date validation
* fix: implemented suggested code
* fix: updated test case
2021-02-24 12:39:23 +05:30
rohitwaghchaure
8212b62598
Merge pull request #24724 from rohitwaghchaure/change-log-for-v13-beta-12
...
chore: change log
2021-02-24 12:31:05 +05:30
Rucha Mahabal
402fcbd489
Merge pull request #24716 from pateljannat/issue-custom-buttons
...
fix: custom buttons in issue
2021-02-24 11:47:29 +05:30
Rohit Waghchaure
f613d41408
chore: change log
2021-02-24 11:20:29 +05:30
Ankush Menat
23c30e43f0
fix: make round off GLE always non-opening
...
Opening GL entries can not be for profit and loss accounts. Round off
accounts are by default P&L account. Hence when making opening entry,
make round off entries as non-opening.
Related issue: ISS-20-21-09677
2021-02-24 11:03:24 +05:30
Daniel Chalmers
c04ed62863
Allow renaming skills
2021-02-23 22:02:09 -06:00
rohitwaghchaure
8faf8e4b25
Merge pull request #24718 from rohitwaghchaure/fixed-patch-item-reposting-pre-release
...
fix: patch failing because of incorrect gl entries
2021-02-24 00:43:16 +05:30
Rohit Waghchaure
39b5ad8e69
fix: patch failing because of incorrect gl entries
2021-02-23 18:35:36 +05:30
Rohit Waghchaure
bc8c9de26d
fix: patch failing because of incorrect gl entries
2021-02-23 18:26:48 +05:30
Deepesh Garg
231aec9257
Merge pull request #24478 from nextchamp-saqib/tcs_calculation
...
feat: tax collected at source using tax withholding category
2021-02-23 18:04:38 +05:30
pateljannat
1e2772d389
fix: custom buttons in issue
2021-02-23 17:55:51 +05:30
Ankush Menat
d5656f4b76
fix(india): Escape json characters in text fields ( #24699 )
...
Escape all text fields and add helpful error message if JSON decode
error does happen.
2021-02-23 17:26:37 +05:30
Nabin Hait
d46b23699c
fix: optimize reposting of gle and sle ( #24702 )
...
* fix(india): escape for special characters in JSON (#24695 )
JSON does not accept special whitespace characters like tab, carriage
return, line feed
Ref: https://www.ecma-international.org/wp-content/uploads/ECMA-404_2nd_edition_december_2017.pdf
Related issue: ISS-20-21-09811
* fix: Accounting Dimension creation background job timeout
* fix(regional): vehicle no is mandatory for ewaybill generation (#24679 )
* fix: vehicle no required for e-invoice
* fix: ewaybill generation dialog condition
* fix: excluding unidentified accounts from gstr-1
* fix: optimize reposting of sle and gle (#24694 )
* fix: optimize update_gl_entries_after method
* fix: Optimized reposting patch
* fix: accounting dimensions
* added reload_doc in patch
* Update item_reposting_for_incorrect_sl_and_gl.py
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
* fix: Replaced spaces with tabs
* fix: merge conflict
* fix: test cases
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
Co-authored-by: pateljannat <pateljannat2308@gmail.com>
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
2021-02-23 16:38:52 +05:30
Saqib
eb1233425e
Merge branch 'develop' into tcs_calculation
2021-02-23 15:58:18 +05:30
Saqib Ansari
85c91ca2db
Merge branch 'develop' into tcs_calculation
2021-02-23 15:56:29 +05:30
Saqib Ansari
2fb3647a4c
Merge branch 'develop' into tcs_calculation
2021-02-23 15:55:36 +05:30
Deepesh Garg
c532b99a4c
Merge pull request #24708 from AfshanKhan/fix-column-name-BOM-Stock-Calculated-report
...
fix: column names in report BOM Stock Calculated
2021-02-23 13:56:14 +05:30
Afshan
ae63d66b8f
fix: column names
2021-02-23 13:38:52 +05:30
