Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
36,102 Commits 3 Branches 0 Tags 1 GiB
81d49e9c71
Commit Graph

36102 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rucha Mahabal
56c428663f
fix: Additional Salary component amount not getting set (#25356) 2021-04-15 18:54:38 +05:30
Rucha Mahabal
39b1cd827a
fix: Additional Salary component amount not getting set (#25355) 2021-04-15 18:54:29 +05:30
rohitwaghchaure
72929aab38
Merge pull request #24878 from anupamvs/planning 
feat: add total available stock field in PO
 2021-04-15 16:28:49 +05:30
Sun Howwrongbum
c50fbc6897
fix: list lookup with undefined variable (#25210) 
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-04-15 14:52:13 +05:30
rohitwaghchaure
640b5e00ce
Merge pull request #25152 from ankush/customer_duplicates 
fix: disable auto naming of customer during import
 2021-04-15 14:46:11 +05:30
rohitwaghchaure
1bdc457777
Merge pull request #25304 from ankush/fix_sl_rounding 
fix(stock_ledger): round off values near to zero
 2021-04-15 14:44:09 +05:30
Saqib
593071bd53
fix: currency symbol in bank transaction list view (#25336) 2021-04-15 14:12:11 +05:30
Anupam Kumar
ee0dda6ba5
Merge branch 'develop' into planning 2021-04-15 12:48:25 +05:30
Marica
61f5f36c65
Merge pull request #24910 from AndyOverLord/patch-8 
fix: copy_parent_value_in_all_row function error
 2021-04-14 19:04:23 +05:30
Marica
f045fde9f4
Merge branch 'develop' into patch-8 2021-04-14 18:56:15 +05:30
Marica
24e45163d5
fix: Sider 2021-04-14 18:53:15 +05:30
Ganga Manoj
c4565651ff
fix: Let Administrator delete company transactions (#25300) 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-04-14 17:11:36 +05:30
Saqib
b54cc7c7f5
fix: pos print receipt (#25330) 2021-04-14 15:09:11 +05:30
Saqib
d4fd1038dc
fix: pos print receipt (#25329) 2021-04-14 15:07:10 +05:30
Saqib
8798f30808
fix: pos print receipt (#25328) 2021-04-14 15:05:33 +05:30
rohitwaghchaure
ac6facda3d
Merge pull request #25186 from rohitwaghchaure/fixed-incorrect-batch-selected-in-purchase-rceipt-develop 
fix: incorrect batch picked in subcontracted purchase receipt
 2021-04-14 14:35:12 +05:30
rohitwaghchaure
3d9d4e03de
Merge pull request #25145 from rohitwaghchaure/fixed-incorrect-incoming-rate-for-sales-return-issue-develop 
fix: incorrect incoming rate for the sales return
 2021-04-14 14:34:46 +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
Nabin Hait
1bc65ddbe4
Merge branch 'develop' into purchase-invoice-to-purchase-receipt-develop 2021-04-14 11:23:34 +05:30
Nabin Hait
90df99e470
Merge branch 'develop' into fixed-incorrect-incoming-rate-for-sales-return-issue-develop 2021-04-14 11:23:25 +05:30
Nabin Hait
5931931c93
Merge branch 'develop' into customer_duplicates 2021-04-14 11:23:12 +05:30
Nabin Hait
f7441c4c0a
Merge branch 'develop' into fixed-incorrect-batch-selected-in-purchase-rceipt-develop 2021-04-14 11:23:00 +05:30
Nabin Hait
b7b35734a7
Merge branch 'develop' into employee-util-report 2021-04-14 11:22:51 +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
Nabin Hait
dd02b5abf1
Merge branch 'develop' into fix_sl_rounding 2021-04-14 10:36:40 +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
Marica
1f9d231acf
Merge branch 'develop' into patch-8 2021-04-13 15:43:46 +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