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

37103 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
f9e9d86955
test: fetching of previous sle (#26352) 2021-07-06 18:09:21 +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
53e3435770
fix: remove cancelled entries in consolidated financial statements (#26330) 2021-07-06 14:37:21 +05:30
Rucha Mahabal
f67c95d32f fix: flaky SLA test 2021-07-06 13:27:48 +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
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
marination
8418c4bfe0 fix: Include Stock Reco logic in update_qty_in_future_sle 2021-07-05 21:58:50 +05:30
Deepesh Garg
8c1b764a90 fix: Debug tests 2021-07-05 21:49:10 +05:30
Afshan
668da102c9
Merge branch 'develop' into fix-account-selection-gst-settings 2021-07-05 21:35:23 +05:30
GangaManoj
6e0d83d925 feat(Sales Invoice): Add 'Discount Account' field in Items table 2021-07-05 15:09:05 +05:30
GangaManoj
be15e16b84 feat(Accounts Settings): Add 'Enable Discount Accounting' checkbox 2021-07-05 14:58:32 +05:30
Ankush Menat
03f7bf6589 test: variant BOM from template BOM 2021-07-05 12:26:14 +05:30
Richard Case
046e83bf50 fix: incorrect bom no. added for non-variant items on variant boms (#26320) 2021-07-05 12:26:14 +05:30