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

38858 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Saqib
7c5711ddf4
fix: pos item cart dom updates (#26459) 2021-07-13 14:09:06 +05:30
Rucha Mahabal
40793f4a18 test: introduce cypress tests 
Co-authored-by: Ankush <ankush@iwebnotes.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-07-13 13:17:19 +05:30
Rucha Mahabal
fc4079587b Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into org-chart 2021-07-13 12:38:37 +05:30
Anupam Kumar
a8b6cf8114
fix: bank remittance report issue (#26398) 2021-07-13 11:45:34 +05:30
Marica
fad426fd5c
Merge pull request #26454 from noahjacob/supplier_defaults_v13pr 
feat: fetching details from supplier/customer groups
 2021-07-13 11:39:55 +05:30
rohitwaghchaure
84f23ac8d2
Merge pull request #26222 from 18alantom/teabox-cogs-by-item-group 
feat: report to show cogs by item groups
 2021-07-13 11:24:59 +05:30
Deepesh Garg
4a2e4748ac fix: Unallocated amount for inclusive charges 2021-07-13 11:22:55 +05:30
Marica
8123478474
Merge pull request #26131 from noahjacob/supplier_defaults_fix 
feat: fetching details from supplier/customer groups
 2021-07-13 11:13:05 +05:30
Noah Jacob
74b3fc1e1c refactor: suggested changes 2021-07-13 11:05:53 +05:30
Noah Jacob
1e8f598ba5 fix: Sider 2021-07-13 11:05:53 +05:30
Noah Jacob
dd0a8f20e2 test: updated test cases 2021-07-13 11:05:53 +05:30
Noah Jacob
fedee0e8da test: test cases for fetching customer group details 2021-07-13 11:05:53 +05:30
Noah Jacob
f07f7e9305 test: test case for fetching supplier group details 2021-07-13 11:05:53 +05:30
Noah Jacob
1cb2af00a8 feat: details fetched from customer group in customer 2021-07-13 11:05:53 +05:30
Noah Jacob
9965af166e feat: details fetched from supplier group in supplier 2021-07-13 11:05:53 +05:30
Marica
73c9a21987
Merge branch 'develop' into supplier_defaults_fix 2021-07-13 10:31:10 +05:30
GangaManoj
8f7b0a1753 fix: Create common function for discount accounting 2021-07-13 03:01:02 +05:30
GangaManoj
65e2b9fee6 fix: Filter options for Discount Account 2021-07-13 02:14:18 +05:30
GangaManoj
81375aec1f fix: Copy Discount Account from first row 2021-07-13 02:09:40 +05:30
GangaManoj
4b8918e8a7 fix: Display Discount Account only if Enable Discount Accounting is checked 2021-07-13 02:07:46 +05:30
GangaManoj
555852c5ef fix: Add Discount Account field 2021-07-13 02:06:03 +05:30
GangaManoj
b85d3017a1 fix: Filter options for Default Discount Account 2021-07-13 01:45:20 +05:30
GangaManoj
0b7d8fb3af fix: Move Default Discount Account field to Item Defaults 2021-07-13 01:45:20 +05:30
GangaManoj
4fcdc5d129 fix: Copy discount account from first row to all Items 2021-07-13 01:45:20 +05:30
GangaManoj
b22dba1146 fix: Filter Discount Account list 2021-07-13 01:45:20 +05:30
GangaManoj
0d5ad3b1bb fix: Add description for Enable Discount Accounting checkbox 2021-07-13 01:45:20 +05:30
Deepesh Garg
30f771b26c Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into payment_entry_taxes_v12 2021-07-12 23:34:13 +05:30
Deepesh Garg
855e9030f2 fix: Deduct included taxes from unallocated amount 2021-07-12 22:11:57 +05:30
Saqib
0683337f14
fix: incorrect response by variance & resolution by variance (#26173) 2021-07-12 20:21:07 +05:30
Saqib
7fb64d1645
fix: exchange gain loss not set for advances linked with invoices (#26436) 2021-07-12 18:33:16 +05:30
Deepesh Garg
1298956482 fix: Use update flag for company dependant fixtures 2021-07-12 18:29:52 +05:30
Nabin Hait
ca6e4bed9f
Merge pull request #26431 from nabinhait/reposting-optimization 
refactor: Optimized code for reposting item valuation
 2021-07-12 15:42:24 +05:30
Nabin Hait
1ef1daf383
Merge pull request #26432 from nabinhait/reposting-optimization-v13-pre-release 
refactor: Optimized code for reposting item valuation
 2021-07-12 15:42:19 +05:30
Nabin Hait
826d2b1e7b
Merge pull request #26433 from nabinhait/reposting-optimization-develop 
refactor: Optimized code for reposting item valuation
 2021-07-12 15:42:14 +05:30
Saqib
a20999cfbc
fix: exchange gain loss not set for advances linked with invoices (#25369) 2021-07-12 14:33:23 +05:30
Saqib
b75b556bbb
fix: move the rename abbreviation job to long queue (#26435) 2021-07-12 14:32:37 +05:30
Saqib
9e1819d366
fix: move the rename abbreviation job to long queue (#26434) 2021-07-12 14:31:57 +05:30
Nabin Hait
97bce3af9a refactor: Optimized code for reposting item valuation 2021-07-12 13:33:08 +05:30
Nabin Hait
0003938f2b refactor: Optimized code for reposting item valuation 2021-07-12 13:29:20 +05:30
Nabin Hait
01aada6c90 refactor: Optimized code for reposting item valuation 2021-07-12 13:28:19 +05:30
Nabin Hait
45e6cffa4f refactor: Optimized code for reposting item valuation 2021-07-12 13:26:08 +05:30
Jannat Patel
b4ea185eca
fix: added company filter while fetching loans (#26295) 
* fix: added company filter while fetching loans

* fix: added set_query in refresh

* fix: quotes

* fix: tests

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-07-12 13:15:41 +05:30
Jannat Patel
38994bd494
fix: Added Company filters for Loan (#26294) 
* fix: loan validations

* fix: added company filter while fetching loans

* fix: tests
 2021-07-12 13:01:31 +05:30
Noah Jacob
ae41b53cee fix: stock_rbnb not defined (#26354) 2021-07-12 12:51:38 +05:30
rohitwaghchaure
e2c97b1a2b
Merge pull request #26351 from rohitwaghchaure/fixed-putaway-fixing-for-material-receipt-develop 
fix: stock entry with putaway rule not working
 2021-07-12 12:49:25 +05:30
Nabin Hait
470c7e773f fix: merge conflict 2021-07-12 12:45:49 +05:30
Deepesh Garg
4ff98cc171 fix: Incorrect discount amount on amended document 2021-07-12 11:27:28 +05:30
Afshan
7e05bea6a9
fix: dunning calculation of grand total when rate of interest is 0% (#26286) 2021-07-12 11:11:58 +05:30
Afshan
10473b1195
fix: dunning calculation of grand total when rate of interest is 0% (#26285) 2021-07-12 11:11:29 +05:30
Afshan
bf03671a33
fix(report): iterate on accounts only when accounts exist (#26391) 2021-07-12 11:10:28 +05:30