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

36699 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
fc20ff02d0
Merge pull request #26418 from deepeshgarg007/gstr_1_json_dpwnload_error 
fix: Unable to download GSTR-1 json
 2021-07-13 16:17:37 +05:30
Deepesh Garg
eef8e4a9d4
Merge pull request #26292 from deepeshgarg007/amended_doc_discount 
fix: Incorrect discount amount on amended document
 2021-07-13 15:34:24 +05:30
Rohit Waghchaure
0d190bb930 fix: multi-currency issue 2021-07-13 15:32:39 +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
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
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
Saqib
b75b556bbb
fix: move the rename abbreviation job to long queue (#26435) 2021-07-12 14:32:37 +05:30
Nabin Hait
45e6cffa4f refactor: Optimized code for reposting item valuation 2021-07-12 13:26:08 +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
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
f60c3f0655
fix: error popup for COA errors (#26358) 2021-07-12 11:07:30 +05:30
Saqib
432d8efa3d
fix(pos): taxes amount in pos item cart (#26411) 2021-07-12 10:47:40 +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
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
Deepesh Garg
e282effaed fix: Error on creation of company for India 2021-07-10 20:23:52 +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
Deepesh Garg
77f2d2d01e fix: Unable to download GSTR-1 json 2021-07-10 10:06:38 +05:30
Deepesh Garg
eae7c1891f fix: Remove unintentional changes 2021-07-09 20:08:29 +05:30
Deepesh Garg
c13ac4ab11 fix: Remove unintentional changes 2021-07-09 20:00:55 +05:30
Deepesh Garg
171ee51507 fix: Hide amount after tax fields 2021-07-09 18:52:39 +05:30
Deepesh Garg
38fa3a3f89 fix: Unallocated amount in Payment Entry after taxes 2021-07-09 18:04:24 +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
Subin Tom
9ac63da457
fix: value fetching for custom field in POS (#26367) 2021-07-09 14:35:11 +05:30
Subin Tom
d53991857c
fix: Fixed Budget Variance Graph color from all black to default (#26368) 2021-07-09 14:33:00 +05:30
Marica
eb0dea09bb
Merge pull request #26333 from marination/lcv-validate-invoice 
fix: Validate LCV for Invoices without Update Stock
 2021-07-09 13:41:34 +05:30
Marica
01be96adb2
Merge branch 'version-13-hotfix' into qi-rejection 2021-07-09 13:30:21 +05:30
marination
bf462abb00 fix: Rename function and tweak logic 
- Dont validate PI on `else`
 2021-07-09 13:12:33 +05:30
Anurag Mishra
afafe406c8
Merge pull request #26388 from Anurag810/training_fix_v13 
fix: Query for Training Event
 2021-07-09 12:21:17 +05:30
Saqib
8f3c7ab402
fix: escape quotes while fetching customer emails (#26329) (#26376) 2021-07-09 10:35:55 +05:30
Rucha Mahabal
e5a1bb7141
Merge pull request #26394 from ruchamahabal/fix-test-precision 
fix: precision for expected values in payment entry test
 2021-07-08 23:46:19 +05:30
Rucha Mahabal
3888488b36 fix: precision for expected values in payment entry test 2021-07-08 23:21:48 +05:30
Alan
257cbd3b92
fix: track changes on batch (#26382) 2021-07-08 18:44:30 +05:30
Anurag Mishra
a82e9e42e1 fix: query for training Event 2021-07-08 17:27:21 +05:30
Jannat Patel
cf28950327
Merge pull request #26349 from Anurag810/salary-slip-fix--hotfix 
fix: payroll-entry minor fix
 2021-07-08 13:43:55 +05:30
Anurag Mishra
8f945a9852 fix: Removed un-used flag 2021-07-08 13:06:04 +05:30
Mohammad Hasnain Mohsin Rajan
00f90c50c0 chore: add product listing link in settings (#26026) 
* chore: add product listing link in settings

* chore: add icon in workspace card

Co-authored-by: Ankush <ankush@iwebnotes.com>
 2021-07-07 18:21:12 +05:30
rohitwaghchaure
f130f8385e
Merge pull request #26332 from rohitwaghchaure/fixed-bom-stock-report-not-working 
fix: bom stock report not working
 2021-07-07 00:22:03 +05:30
rohitwaghchaure
2bdc0e8993
Merge pull request #26350 from rohitwaghchaure/fixed-putaway-fixing-for-material-receipt 
fix: stock entry with putaway rule not working
 2021-07-07 00:15:26 +05:30
Rohit Waghchaure
0bd190b885 fix: stock entry with putaway rule not working 2021-07-07 00:14:51 +05:30
Nabin Hait
11d56903e7
Merge pull request #25415 from deepeshgarg007/bootstraped_gst_setup 
feat(India): Bootstrapped GST Setup
 2021-07-06 21:44:30 +05:30
Deepesh Garg
67c7067778
Merge pull request #26300 from AfshanKhan/fix-account-selection-gst-settings-v13 
fix: only "Tax" type accounts should be shown for selection in GST Settings
 2021-07-06 20:33:41 +05:30
Saqib
422325bb74 test: fetching of previous sle (#26352) 2021-07-06 18:37:12 +05:30
Deepesh Garg
3636efd7e6
Merge pull request #26355 from deepeshgarg007/flaky_test 
test: Purchase Invoice advance test case
 2021-07-06 18:22:26 +05:30