barredterra
dcfc3d7d12
fix: remove redundant calls to create_sales_tax
2021-03-04 19:29:55 +01:00
Deepesh Garg
82c6223196
Merge pull request #24745 from ankush/no_team_updates
...
fix(HR): hide "more" button from team updates
2021-03-02 18:55:34 +05:30
Deepesh Garg
ecde26409b
Update team_updates.js
2021-03-02 18:54:50 +05:30
Deepesh Garg
846500e8bc
Merge pull request #24751 from danielchalmers/patch-2
...
chore: Add description field & enable quick entry
2021-03-02 18:53:51 +05:30
Deepesh Garg
a5c4558f8b
feat: Additon of leave details in Salary Slip ( #24674 )
...
* feat: Additon of leave details in Salary Slip
* fix: Change leaves to leave
2021-03-02 18:36:48 +05:30
Deepesh Garg
7a5b6021b9
Merge pull request #24772 from anupamvs/si-timesheet
...
feat: provision to pull timesheet in sales invoice
2021-03-02 18:05:42 +05:30
Deepesh Garg
f06c166ee4
Merge pull request #24773 from UrvashiKishnani/patch-1
...
fix: GL Entries for AP/AR Summary
2021-03-02 17:49:13 +05:30
Jannat Patel
b27d4f6095
fix: salary slip working hours increment ( #24784 )
2021-03-02 17:44:42 +05:30
Nabin Hait
190106a8b8
fix: rounding of earned leave is optional ( #24782 )
2021-03-02 13:38:14 +05:30
Nabin Hait
bd10d7c028
fix: reposting patch fixes ( #24775 )
2021-03-02 13:37:45 +05:30
Anupam
47ce85484b
feat: provistion to pull timesheet in sales invoice
2021-03-02 11:31:26 +05:30
UrvashiKishnani
810a36105c
fix: GL Entries for AP/AR Summary without SQL join
...
SQL query modified to fetch only those GL Entries for Accounts Payable Summary and Accounts Receivable Summary reports where the corresponding payment entry is not in cancelled state.
2021-03-02 08:20:03 +04:00
Deepesh Garg
f45756d821
Merge pull request #24735 from FHenry/fix_create_item_tax_with_salespurchasetax
...
fix: add item taxes at the same times as sales and purchase taxes
2021-03-01 20:52:42 +05:30
Deepesh Garg
236a232de0
Merge pull request #24769 from rohitwaghchaure/allow-to-set-item-in-batch-naming
...
fix: allow to select item code in batch naming
2021-03-01 20:25:14 +05:30
Daniel Chalmers
2efdfa26b4
fix: Change FieldType from Text to Text Editor in Non-Conformance DocType ( #24760 )
...
* Enable Text Editors
Enable rich Text Editors for Corrective Action and Preventive Action fields. Closes #24759
* Update non_conformance.json
2021-03-01 15:44:16 +05:30
UrvashiKishnani
10e4b9d4e8
fix: GL Entries for AP/AR Summary
...
SQL query modified to fetch only those GL Entries for Accounts Payable Summary and Accounts Receivable Summary reports where the corresponding payment entry is in submitted state.
2021-03-01 12:50:07 +04:00
Rohit Waghchaure
eb6b3cfe6d
fix: allow to select item code in batch naming
2021-03-01 11:32:39 +05:30
Anuja Pawar
8755339cba
fix: to update sales person's incentives on save ( #24179 )
2021-03-01 10:44:13 +05:30
Saqib
fa777555b7
fix(india): inflated item tax rate for e-invoicing ( #24752 )
2021-02-28 20:46:23 +05:30
Deepesh Garg
d7a81be56d
Merge pull request #24742 from deepeshgarg007/project_filter_search_fields
...
fix: Add searchfields in project query
2021-02-27 18:20:56 +05:30
Deepesh Garg
6fdd859a10
Merge pull request #24700 from deepeshgarg007/rounding_issue_fix
...
fix: Issue on posting inter-warehouse transfer invoice
2021-02-27 17:30:01 +05:30
Deepesh Garg
b5819c74c8
Merge branch 'develop' of https://github.com/frappe/erpnext into project_filter_search_fields
2021-02-27 17:29:11 +05:30
Daniel Chalmers
aa09628358
Skill fields: enable allow_in_quick_entry
2021-02-26 15:24:34 -06:00
rohitwaghchaure
630ce6e531
Merge pull request #24754 from rohitwaghchaure/fixed-repost-item-valuation-patch
...
fix: reposting patch
2021-02-26 23:58:29 +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
