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

37841 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Sagar Vora
ea2470d174
Merge pull request #26361 from ankush/backport/version-13-pre-release/pr-26354 
fix: stock_rbnb not defined (#26354)
 2021-07-07 11:59:37 +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
Deepesh Garg
3af607ba04
Merge pull request #26299 from AfshanKhan/fix-account-selection-gst-settings 
fix: only "Tax" type accounts should be shown for selection in GST Settings
 2021-07-06 20:33:21 +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
Deepesh Garg
787cd77f03
Merge pull request #26323 from deepeshgarg007/multi-company-deferred-revenue_develop 
fix: Auto process deferred accounting for multi-company setup
 2021-07-06 16:55:55 +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
rohitwaghchaure
2fbe41de36
Merge pull request #26342 from marination/stock-reco-repost-qty-develop 
fix: Include Stock Reco logic in `update_qty_in_future_sle`
 2021-07-06 11:22:41 +05:30