Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
37,503 Commits 3 Branches 0 Tags 1 GiB
7cbd755951
Commit Graph

37503 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Saqib
0683337f14
fix: incorrect response by variance & resolution by variance (#26173) 2021-07-12 20:21:07 +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
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
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
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
Afshan
4b4ac7c051
fix(report): iterate on accounts only when accounts exist (#26390) 2021-07-12 11:10:00 +05:30
Afshan
f60c3f0655
fix: error popup for COA errors (#26358) 2021-07-12 11:07:30 +05:30
Afshan
6467632f60
fix: error popup for COA errors (#26357) 2021-07-12 11:07:06 +05:30
Saqib
432d8efa3d
fix(pos): taxes amount in pos item cart (#26411) 2021-07-12 10:47:40 +05:30
Jannat Patel
620b54846e
Merge branch 'develop' into campaign-module 2021-07-12 10:26:43 +05:30
Ankush
caacd0ad2c
fix: stock levels disapperaing on refresh (bp #26305) 
refresh_section removes all sections with `custom` class, added
different class to avoid this behaviour.

# Conflicts:
#	erpnext/stock/doctype/item/item.js
 2021-07-12 10:20:19 +05:30
Ankush Menat
22cb642831 chore: update test company FY 2021-07-12 10:09:50 +05:30
Ankush Menat
203c2b2292 ci: show bench logs if ui test fails 2021-07-12 10:09:50 +05:30
Ankush Menat
bedb0addf0 test: ui test for stock levels 2021-07-12 10:09:50 +05:30
Ankush Menat
b99469cdab fix: stock levels disapperaing on refresh 
refresh_section removes all sections with `custom` class, added
different class to avoid this behaviour.
 2021-07-12 10:09:50 +05:30
Noah Jacob
0be6583083 refactor: suggested changes 2021-07-12 09:18:19 +05:30
Noah Jacob
34a5cb9106 fix: Sider 2021-07-12 08:48:04 +05:30
Marica
e39a7f29e2
Merge pull request #26421 from marination/qi-rejection-develop 
feat: Optionally allow rejected quality inspection on submission
 2021-07-11 11:30:48 +05:30
Marica
f7748e4109
Merge pull request #26133 from marination/qi-rejection 
feat: Optionally allow rejected quality inspection on submission
 2021-07-10 21:04:32 +05:30
marination
f67f13c384 chore: Test case for QI Rejection in Stock Entry 
- Use `get_single_value` instead of `get_doc` in validation
- Test Case to check impact of stock settings on SE with rejected qi
 2021-07-10 21:02:36 +05:30
Marica
9ba3fce4fd fix: Consistent alert indicators 2021-07-10 21:02:28 +05:30
marination
654e9d85d1 fix: sider and semgrep 2021-07-10 21:02:19 +05:30
marination
9ac9a4ef21 feat: Optionally allow rejected quality inspection on submission 2021-07-10 21:02:03 +05:30
marination
c8a825c478 chore: Test case for QI Rejection in Stock Entry 
- Use `get_single_value` instead of `get_doc` in validation
- Test Case to check impact of stock settings on SE with rejected qi
 2021-07-10 18:26:36 +05:30
Saqib
727e5d16bc
chore: add .backportrc to gitignore (#26403) 2021-07-09 21:55:37 +05:30
Kenneth Sequeira
862ce916ae
fix: Nested/Multi-level BOM help link (#26409) 
Updated the link for multi-level boms. Current link is broken.
 2021-07-09 21:52:50 +05:30
Afshan
f4d45d60f4
Revert "fix: updated onboarding steps for selling module" (#26414) 
This reverts commit 446171acc4.
 2021-07-09 20:45:43 +05:30
Anuja
446171acc4 fix: updated onboarding steps for selling module 2021-07-09 19:31:44 +05:30
GangaManoj
ef42e80065 fix: Sider issues 2021-07-09 19:25:54 +05:30
Saqib
2098684bc0
fix(pos): taxes amount in pos item cart (#26410) 2021-07-09 18:09:26 +05:30
Saqib
13d7043451
fix: column 'outstanding_amount' cannot be null (#26404) 2021-07-09 15:33:14 +05:30
Saqib
fe4f58d0f6
fix(e-invoicing): allow export invoice even if no taxes applied (#26405) 2021-07-09 15:32:54 +05:30
Saqib
8e8434a78a
fix: omit item discount amount for e-invoicing (#26353) (#26407) 2021-07-09 15:32:28 +05:30
Marica
de4450aee9
Merge pull request #26401 from marination/order-by-weightage-for-web-items-develop 
fix: Order Items by weightage in the web items query
 2021-07-09 15:20:02 +05:30