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

28014 Commits

Author SHA1 Message Date
rohitwaghchaure
bd8699b8a9
Merge pull request #26458 from rohitwaghchaure/fixed-multi-currency-issue-pre 
fix: multi-currency issue
 2021-07-13 16:05:36 +05:30
Deepesh Garg
fea29ae8cb fix: Use update flag for company dependant fixtures 2021-07-13 16:05:05 +05:30
Deepesh Garg
7be9f8dab1 fix: Error on creation of company for India 2021-07-13 16:04:56 +05:30
Deepesh Garg
0bad696faf fix: Unable to download GSTR-1 json 2021-07-13 15:46:58 +05:30
Deepesh Garg
fc9714b871 fix: Unable to download GSTR-1 json 2021-07-13 15:45:34 +05:30
Deepesh Garg
07d9f3f74b fix: Incorrect discount amount on amended document 2021-07-13 15:35:59 +05:30
Rohit Waghchaure
4acbeecbbe fix: multi-currency issue 2021-07-13 15:35:30 +05:30
Deepesh Garg
a5200d6a43
Merge pull request #26429 from deepeshgarg007/amended_doc_discount_develop 
fix: Incorrect discount amount on amended document
 2021-07-13 15:34:32 +05:30
18alantom
a4eba7a409 fix: show child item group items on portal 2021-07-13 15:34:25 +05:30
Saqib
621927d9f9
fix: move the rename abbreviation job to long queue (#26462) 2021-07-13 14:13:39 +05:30
Saqib
7c5711ddf4
fix: pos item cart dom updates (#26459) 2021-07-13 14:09:06 +05:30
Anupam Kumar
a8b6cf8114
fix: bank remittance report issue (#26398) 2021-07-13 11:45:34 +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
Saqib
0683337f14
fix: incorrect response by variance & resolution by variance (#26173) 2021-07-12 20:21:07 +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
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
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
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
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
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
e6ce3bb7ff
Merge branch 'develop' into order-by-weightage-for-web-items-develop 2021-07-09 15:05:46 +05:30
Saqib
77e00403c8
fix: omit item discount amount for e-invoicing (#26353) 2021-07-09 14:41:03 +05:30
Saqib
b199702977
fix(e-invoicing): allow export invoice even if no taxes applied (#26363) 2021-07-09 14:37:34 +05:30
Saqib
47ccfd6c9d
fix: column 'outstanding_amount' cannot be null (#26371) 2021-07-09 14:36:13 +05:30
Subin Tom
9ac63da457
fix: value fetching for custom field in POS (#26367) 2021-07-09 14:35:11 +05:30
Marica
50170a8e62
Merge branch 'develop' into order-by-weightage-for-web-items-develop 2021-07-09 14:34:56 +05:30
Subin Tom
95a15ed85d
fix: value fetching for custom field in POS (#26366) 2021-07-09 14:34:51 +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
marination
99f449939d fix: Order Items by weightage in the web items query 2021-07-09 13:44:29 +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
marination
98173038b5 fix: Rename function and tweak logic 
- Dont validate PI on `else`
 2021-07-09 13:38:23 +05:30
marination
86f5dfbb8f fix: Validate LCV for Invoices without Update Stock 2021-07-09 13:38:15 +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
Anurag Mishra
6949114569
Merge pull request #26389 from Anurag810/training_v13_fix 
fix: Query for Training Event
 2021-07-09 12:20:57 +05:30
Saqib
f6f924b340
Merge branch 'develop' into asset-credit-note 2021-07-09 10:38:50 +05:30
Saqib
8f3c7ab402
fix: escape quotes while fetching customer emails (#26329) (#26376) 2021-07-09 10:35:55 +05:30
Rucha Mahabal
3888488b36 fix: precision for expected values in payment entry test 2021-07-08 23:21:48 +05:30
Rucha Mahabal
88929b055c fix: precision for expected values in payment entry test 2021-07-08 19:27:53 +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
Anurag Mishra
b6ff8917e8 fix: query for training Event 2021-07-08 17:25:37 +05:30
Rucha Mahabal
a4132d7ec6
Merge branch 'develop' into fix-sla-test 2021-07-08 16:20:11 +05:30
Rucha Mahabal
091f41e986 fix: yet another fix for flaky SLA Test 2021-07-08 14:57:54 +05:30
Jannat Patel
42214999a6
Merge branch 'develop' into salary-slip-fix--develop 2021-07-08 13:44:12 +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
Anurag Mishra
fac420ee09 fix: Removed un-used flag 2021-07-08 13:05:14 +05:30
Saqib
eaef371585
fix: escape quotes while fetching customer emails (#26329) 2021-07-08 10:52:41 +05:30
GangaManoj
cfff3b8726 fix: Test GL Entries made when an Asset is returned 2021-07-07 21:04:20 +05:30
GangaManoj
298b43c177 fix: Let create_item() make items that are fixed assets 2021-07-07 20:56:15 +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
GangaManoj
3a7f25b218 fix: Make functions more readable 2021-07-07 15:59:52 +05:30
Saqib
9910968398
Merge branch 'develop' into enable-discount-accounting 2021-07-07 12:56:11 +05:30
Saqib
0b320b5909
Merge pull request #25798 from GangaManoj/asset-repair-refactor 
refactor: Asset Repair
 2021-07-07 12:44:50 +05:30
Mohammad Hasnain Mohsin Rajan
290350c86f
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 12:10:02 +05:30
Noah Jacob
a01264dae7
fix: stock_rbnb not defined (#26354) 2021-07-07 11:07:19 +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
Rohit Waghchaure
dd1b2995a8 fix: stock entry with putaway rule not working 2021-07-07 00:16:35 +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
GangaManoj
ca87745be1 fix: Rename get_gl_entries_on_asset_movement to get_gl_entries_on_asset_disposal_and_regain 2021-07-06 23:43:08 +05:30
Nabin Hait
d45ebaf61c
Merge pull request #26347 from ruchamahabal/fix-flaky-sla-test 
fix: flaky SLA test
 2021-07-06 21:50:42 +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
bd40669dab
Merge pull request #26289 from nemesis189/fixed-budget-variance-report-color 
fix: Fixed Budget Variance Graph color from all black to default
 2021-07-06 20:36:00 +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
GangaManoj
3ea4f993b7 feat: Toggle display for discount accounting fields according to enable_discount_accounting 2021-07-06 20:22:13 +05:30
Afshan
4ba680a65e
Merge branch 'develop' into fix-account-selection-gst-settings 2021-07-06 19:52:12 +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
Saqib
f9e9d86955
test: fetching of previous sle (#26352) 2021-07-06 18:09:21 +05:30
Noah Jacob
5e99aa7f65
fix: stock_rbnb not defined (#26354) 2021-07-06 18:00:35 +05:30
Deepesh Garg
7f794cc0ea fix: Purchase Invoice advance test case 2021-07-06 17:58:44 +05:30
Deepesh Garg
a62f94379b
Merge pull request #26324 from deepeshgarg007/bank_statement_import_fix_develop 
fix: Bank statement import
 2021-07-06 17:25:21 +05:30
Afshan
11e0ed5f6e
Merge branch 'develop' into fix-account-selection-gst-settings 2021-07-06 17:21:19 +05:30
GangaManoj
657e9b5320 feat: Assign Item's Default Discount Account if present 2021-07-06 16:51:12 +05:30
Rucha Mahabal
e7fceb556d
Merge branch 'develop' into fix-flaky-sla-test 2021-07-06 16:38:46 +05:30
GangaManoj
ef667a9a64 feat: Add Default Discount Account field 2021-07-06 16:29:19 +05:30
GangaManoj
b08bb1f1a2 feat: Filter list for Discount Account field in Items table 2021-07-06 16:28:19 +05:30
Deepesh Garg
2f3f87dc66
Merge branch 'develop' into multi-company-deferred-revenue_develop 2021-07-06 16:14:25 +05:30
Deepesh Garg
26dc02aa38
Merge branch 'develop' into bank_statement_import_fix_develop 2021-07-06 16:14:13 +05:30
Deepesh Garg
381c05eb87
Merge pull request #26322 from deepeshgarg007/party_dashboard_develop 
fix: Do not consider cancelled entries in party dashboard
 2021-07-06 16:13:49 +05:30
Noah Jacob
0734901a89
fix: stock_rbnb not defined (#26345) 2021-07-06 15:56:10 +05:30
Deepesh Garg
8985231a96 fix: Rewrite tests 2021-07-06 15:34:47 +05:30
Afshan
a63796e6f0
Merge branch 'develop' into fix-account-selection-gst-settings 2021-07-06 14:38:26 +05:30
Afshan
c8eca8a448
fix: remove cancelled entries in consolidated financial statements (#26331) 2021-07-06 14:37:57 +05:30
Afshan
53e3435770
fix: remove cancelled entries in consolidated financial statements (#26330) 2021-07-06 14:37:21 +05:30
Anurag Mishra
f0b62f70d5 fix: payroll-entry minor fix 2021-07-06 13:40:22 +05:30
Anurag Mishra
1f5e2ba8e7 fix: payroll-entry minor fix 2021-07-06 13:36:23 +05:30
Mohammed Yusuf Shaikh
842674ce79
fix: Added a message to enable appontment booking if disabled (#26334) 2021-07-06 13:34:32 +05:30
Rucha Mahabal
f67c95d32f fix: flaky SLA test 2021-07-06 13:27:48 +05:30
Marica
dfe11aca6a
Merge pull request #26284 from marination/order-by-weightage-for-web-items 
fix: Order Items by weightage in the web items query
 2021-07-06 13:20:08 +05:30
Afshan
d10c016a0b
Merge branch 'develop' into fix-account-selection-gst-settings 2021-07-06 11:56:39 +05:30
Deepesh Garg
96eb3be6df fix: Debug Tests 2021-07-06 11:21:44 +05:30
Deepesh Garg
66c04ca984 fix: Debug tests 2021-07-06 10:56:42 +05:30
GangaManoj
cf7579e29f feat: Create GL Entries for discount accounting 2021-07-06 00:36:06 +05:30
Deepesh Garg
32436eceda fix: Debug tests 2021-07-05 23:34:09 +05:30
Deepesh Garg
c21d3d4865 fix: Debug tests 2021-07-05 22:47:59 +05:30
marination
44c1e8da06 chore: Test to block backdated reco causing future scarcity 2021-07-05 21:59:28 +05:30
marination
e8c9ab4b01 chore: Test for backdated reco qty reposting 2021-07-05 21:59:14 +05:30
marination
8c441263f8 fix: Sider 2021-07-05 21:59:04 +05:30
marination
4038977e2e fix: Handle Stock Reco cancellation and limit reposting 
- Handled cancellation of reco with and without prior SLE
- Repost / Recalculate balance qty only till next stock reco
 2021-07-05 21:58:57 +05:30