Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
35,633 Commits 3 Branches 0 Tags 1 GiB
3e5c6424ed
Commit Graph

35633 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nabin Hait
3e5c6424ed bumped to version 13.1.1 2021-04-27 20:28:01 +05:50
Rucha Mahabal
a86a51f020 fix(HR): Permission error while adding weekly holidays (#25450) 2021-04-27 20:01:49 +05:30
Saqib
7b3dd3585b fix: unexpected keyword argument 'merge_logs' (#25489) 
* fix: unexpected keyword arguement 'merge_logs'

* fix: reference error

* fix: test
 2021-04-27 20:01:08 +05:30
Nabin Hait
db76612462 Merge branch 'version-13-pre-release' into version-13 2021-04-21 12:34:49 +05:30
Nabin Hait
c3b7c1b998 bumped to version 13.1.0 2021-04-21 12:54:49 +05:50
Nabin Hait
cb92ead061 fix: Added Change Log 2021-04-21 11:22:35 +05:30
Marica
0278646fd8
fix: Cashier query in POS Opening/Closing Entry (#25399) 2021-04-20 12:53:33 +05:30
Marica
846200d069
fix: Ignore Customer Group Perm on AlL Products page (#25397) 2021-04-19 22:20:01 +05:30
Afshan
632166a933
fix: make filters for payroll entry (#25386) 2021-04-19 12:58:27 +05:30
Ankush Menat
edf3dfa5a4
fix: commit leave_allocation change to db (#25382) (#25383) 2021-04-19 12:47:41 +05:30
Afshan
b6d2106184
fix: available employee for selection (#25378) 
* fix: available employee for selection

* fix: available employee for selection

fix: available employee for selection
 2021-04-19 11:48:43 +05:30
Saqib
36247faf1a
fix(e-invoicing): add company validation for e-invoicing (#25349) 
* fix(e-invoicing): add company validation for e-invoicing

* fix: test
 2021-04-16 18:45:19 +05:30
Afshan
4b496b65b7
fix: filter for employees in salary slip (#25361) 2021-04-15 23:53:12 +05:30
Rucha Mahabal
56c428663f
fix: Additional Salary component amount not getting set (#25356) 2021-04-15 18:54:38 +05:30
Saqib
b54cc7c7f5
fix: pos print receipt (#25330) 2021-04-14 15:09:11 +05:30
Nabin Hait
2535fe9b1e fix: Resolved merge conflict 2021-04-14 13:09:50 +05:30
Nabin Hait
b77793763a Merge branch 'version-13-pre-release' into version-13 2021-04-14 12:53:53 +05:30
Nabin Hait
88b3c52533 bumped to version 13.0.2 2021-04-14 13:13:53 +05:50
Nabin Hait
ece4c16d8f chore: Added change log 2021-04-14 12:53:25 +05:30
rohitwaghchaure
3f6ba12344
Merge pull request #24408 from rohitwaghchaure/custom-user-type-feat 
feat: Employee Self Service
 2021-04-14 11:54:25 +05:30
Deepesh Garg
e2dc102bc6
fix: Zero amount completed delivery notes being shown in Sales Invocie get items (#25317) 2021-04-14 11:21:11 +05:30
Deepesh Garg
b67058869a
fix: Round off final tax amount instead of current tax amount (#25188) 
* fix: Round off final tax amount instead of current tax amount

* fix: Syntax error

* fix: Indentation

* fix: Round Off taxes order execution

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-04-14 11:20:27 +05:30
Deepesh Garg
b717420842
fix: Role to override maintain same rate check in transactions (#25193) 
* feat: configurable action if the same purchase/selling rate is not maintained

* fix: Role to override maintain same rate check in transactions

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-04-14 10:43:45 +05:30
rohitwaghchaure
ce6c3b5b74
fix: incorrect incoming rate for the sales return (#25306) 2021-04-13 20:55:52 +05:30
Rohit Waghchaure
a8f78fabfd fix: patch failing while migrating from v7 to v13 2021-04-13 18:51:21 +05:30
Rohit Waghchaure
610ccd4c03 fix: modified permission 2021-04-13 18:51:21 +05:30
Rohit Waghchaure
03635fb0c4 feat: ESS User 2021-04-13 18:51:21 +05:30
Saqib
dbb76a7d00
fix(e-invoicing): validations & tax calculation fixes (#25314) 
* fix: GST on freight charge in e-invoicing

* feat(india): bulk e-invoice generation (#24969)

* fix: cannot fetch e invoice settings

* fix: patch condition (#25301)

* fix: patch condition

* fix: except einvoice loading error seperately

* fix: json.loads error

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-04-13 18:49:03 +05:30
Deepesh Garg
ca412d37c8
Merge pull request #25290 from deepeshgarg007/gstr_1_taxable_value_update 
fix: Taxable value including Freight and Forwarding charges in GSTR-1 Report
 2021-04-13 17:49:56 +05:30
Nabin Hait
10c61376e3
fix: Backport missing commits to develop branch (#25305) 2021-04-13 15:46:01 +05:30
Deepesh Garg
2fe3056fa2
Merge pull request #24993 from frappe/ishanloya-regional 
Correct state code for 'Other Territory'
 2021-04-13 15:37:29 +05:30
Deepesh Garg
9aad73b9f0
Merge pull request #25195 from ankush/use_isinstance_instead_of_type 
fix: broken type check in stock ageing report
 2021-04-13 15:24:53 +05:30
Deepesh Garg
0dcb48a6ee
Merge pull request #25167 from ankush/escape_sql_credit_report 
fix: escape sql filters in credit report
 2021-04-13 15:24:15 +05:30
Deepesh Garg
3db8ba2d4a
Merge pull request #25033 from anupamvs/se-add-to-transit 
fix: unable to submit stock entry
 2021-04-13 14:59:54 +05:30
Deepesh Garg
c05f4ee1aa
Merge pull request #25082 from AfshanKhan/add-blank-for-status-issue-reports 
fix: added blank option for status in report related to issue
 2021-04-13 14:59:01 +05:30
Deepesh Garg
bb92929048
Merge pull request #25256 from nextchamp-saqib/italy-e-invoicing 
feat(italy): add document type field for e-invoicing
 2021-04-13 13:48:21 +05:30
Suraj Shetty
36083ff36c
Merge pull request #25310 from rmehta/grid-field-fix 2021-04-13 12:40:27 +05:30
Suraj Shetty
82d0a1a13e style: Add missing semicolons 
- & make formatting consistent
 2021-04-13 12:35:42 +05:30
Rushabh Mehta
ff935b4586 fix(minor): fix dynamically changing grid properties 2021-04-13 12:09:36 +05:30
Rushabh Mehta
3c58fd4d5e fix(minor): fix dynamically changing grid properties 2021-04-13 12:05:10 +05:30
Rushabh Mehta
65f25c27b3 fix(minor): fix dynamically changing grid properties 2021-04-13 11:58:16 +05:30
Abdullah Abouzekry
20140425c8
fix: sales order not saving due type mismatch in promo scheme (#24748) (#25222) 2021-04-13 11:36:39 +05:30
Deepesh Garg
1f49335335
Merge branch 'develop' into gstr_1_taxable_value_update 2021-04-13 10:29:52 +05:30
Ankush Menat
34d00772e7
Merge pull request #25303 from ankush/fix_bom_test 
test: ignore floating point errors in test_bom
 2021-04-12 20:34:10 +05:30
Ankush Menat
c65751d97f
test: ignore floating point errors in test_bom 2021-04-12 19:45:34 +05:30
Saqib
a19c98255f
fix: patch condition (#25301) 2021-04-12 19:02:28 +05:30
Saqib
9320316462
feat(india): bulk e-invoice generation (#24969) 2021-04-12 17:55:46 +05:30
rohitwaghchaure
913845e4ce
Merge pull request #25295 from rohitwaghchaure/changed-scheduler-check-time-pre 
fix: update scheduler check time
 2021-04-12 16:15:33 +05:30
rohitwaghchaure
5e8ec48e7f
Merge pull request #25294 from rohitwaghchaure/changed-scheduler-check-time 
fix: update scheduler check time
 2021-04-12 16:12:13 +05:30
Rohit Waghchaure
bda4c5cc52 fix: update scheduler check tim 2021-04-12 16:11:52 +05:30