Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
38,906 Commits 3 Branches 0 Tags
Commit Graph

7100 Commits

Author SHA1 Message Date
GangaManoj
d24b5f707a fix: Add description for Enable Discount Accounting checkbox 2021-07-21 14:20:32 +05:30
GangaManoj
f48fa2e7f3 feat: Toggle display for discount accounting fields according to enable_discount_accounting 2021-07-21 14:20:06 +05:30
GangaManoj
c4e5429560 feat: Filter list for Discount Account field in Items table 2021-07-21 14:20:06 +05:30
GangaManoj
f6a9374356 feat: Create GL Entries for discount accounting 2021-07-21 14:20:06 +05:30
GangaManoj
a6690a8a3d feat(Sales Invoice): Add 'Discount Account' field in Items table 2021-07-21 14:20:06 +05:30
GangaManoj
e1dc6980d0 feat(Accounts Settings): Add 'Enable Discount Accounting' checkbox 2021-07-21 14:20:06 +05:30
Deepesh Garg
3e109840f9
Merge pull request #26464 from nemesis189/added-dispatch-address-to-sales 
feat: Added dispatch address fields in Sales Ord, Sales Inv, Delivery Note for Eway Bill
 2021-07-21 10:52:10 +05:30
GangaManoj
46bed5e6cc fix: Add mandatory_depends_on property for Discount Account 2021-07-20 22:03:44 +05:30
Rohit Waghchaure
c14aa45720 fix: incorrect valuation rate calculation in gross profit report 2021-07-20 18:19:15 +05:30
GangaManoj
82d147ea62 fix: Tests 2021-07-20 05:16:33 +05:30
GangaManoj
59ee6958aa fix: Make discount_account mandatory if discount accounting is enabled 2021-07-20 03:52:39 +05:30
GangaManoj
4105e27138 fix: Create GL Entries for Additional Discount Account 2021-07-20 03:46:02 +05:30
Ganga Manoj
1d830dfd92
fix: Filter for additional_discount_account 
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-07-19 23:47:58 +05:30
Ganga Manoj
8fc9c13734
fix: Filter for additional_discount_account 
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-07-19 23:46:38 +05:30
Subin Tom
ff9d631f15 fix:Ignore mandatory fields while creating payment reconciliation Journal Entry 2021-07-19 20:28:34 +05:30
Subin Tom
b24a149dbc test: Updated test case for Eway bill 2021-07-19 14:37:12 +05:30
Anuja Pawar
2bbf48e835
Merge branch 'develop' into sa-vat-report 2021-07-18 11:13:25 +05:30
Devin Slauenwhite
d5ff636159 fix: missing parameter 'country' 2021-07-17 14:42:38 -04:00
GangaManoj
831f5edd02 fix: Remove unused imports 2021-07-17 22:55:24 +05:30
GangaManoj
cde0cc0678 fix: Fetch Payment Terms from Sales/Purchase Orders 2021-07-17 22:53:21 +05:30
Ganga Manoj
bfb7256143
Merge branch 'develop' into enable-discount-accounting 2021-07-17 20:01:09 +05:30
GangaManoj
d6956ff075 fix: Add test for additional discount applied on taxes 2021-07-17 19:49:42 +05:30
GangaManoj
99551e9b7f fix: Add test for additional discount applied on taxes 2021-07-17 18:45:21 +05:30
GangaManoj
c4d2dc0da3 fix: Remove unnecessary condition 2021-07-17 17:47:20 +05:30
GangaManoj
c2ba6897b0 fix: Only display Additional Discount Account if Enable Discount Accounting is checked 2021-07-17 17:45:35 +05:30
GangaManoj
fa4c03e7a1 fix: Create ledger entries for discount applied on taxes in make_tax_gl_entries 2021-07-17 17:42:36 +05:30
GangaManoj
7bbc9a886d fix: Filter options for Additional Discount Account 2021-07-17 17:41:06 +05:30
GangaManoj
87d448e039 fix: Add Additional Discount Account field 2021-07-17 17:40:43 +05:30
GangaManoj
b0f21824bc fix: Check all expected GL Entries 2021-07-17 17:34:50 +05:30
Nabin Hait
11475487fb fix: merge conflict 2021-07-16 15:58:50 +05:30
GangaManoj
40412f7e61 fix: Only display Additional Discount Account if Enable Discount Accounting is checked 2021-07-15 22:02:43 +05:30
GangaManoj
8e96e2d5a2 fix: Filter options for Additional Discount Account 2021-07-15 22:01:38 +05:30
GangaManoj
4f2bf98966 fix: Add Additional Discount Account field 2021-07-15 22:01:02 +05:30
Deepesh Garg
cc73e7d6fa
Merge pull request #26472 from deepeshgarg007/payment_entry_taxes_unallocated_amount_v13 
fix: Unallocated amount in Payment Entry after taxes
 2021-07-15 12:38:45 +05:30
Deepesh Garg
5ad759897f
Merge pull request #26471 from deepeshgarg007/payment_entry_taxes_unallocated_amount 
fix: Unallocated amount in Payment Entry after taxes
 2021-07-15 12:38:32 +05:30
Deepesh Garg
1524e7f5ba
Merge pull request #26412 from deepeshgarg007/payment_entry_taxes_v12 
fix: Unallocated amount in Payment Entry after taxes
 2021-07-15 12:38:23 +05:30
Anuja Pawar
259947dae9
Merge branch 'develop' into sa-vat-report 2021-07-14 20:47:41 +05:30
Afshan
74d7baa80a
fix: filter by accounts with group by accounts (#26438) 
* fix: filter by accounts with group by accounts

* fix: parsing json

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-07-14 19:59:11 +05:30
Deepesh Garg
13fffeb97b
Merge pull request #26473 from deepeshgarg007/bootstrapped_gst_setup_develop 
feat(India): Bootstrapped GST Setup
 2021-07-14 16:44:12 +05:30
Saqib
72715956f1
fix: tds computation summary shows cancelled invoices (#26486) 2021-07-14 15:56:20 +05:30
Saqib
ac721ae147
fix: tds computation summary shows cancelled invoices (#26485) 2021-07-14 15:20:14 +05:30
Saqib
1c76154096
fix: tds computation summary shows cancelled invoices (#26456) 2021-07-14 14:45:39 +05:30
Saqib
9c04079d04
fix: test fails due to improper gain loss account set (#26482) (#26484) 2021-07-14 14:45:11 +05:30
Afshan
9168bb369a
fix: filter by accounts with group by accounts (#26439) 2021-07-14 13:57:14 +05:30
Saqib
d86cdb4368
Merge branch 'develop' into payment_entry_taxes_unallocated_amount 2021-07-14 13:55:09 +05:30
Saqib
be773f4052
Merge branch 'develop' into bootstrapped_gst_setup_develop 2021-07-14 13:55:00 +05:30
Saqib
c978fdf3df
fix: test fails due to improper gain loss account set (#26482) 2021-07-14 13:53:30 +05:30
Frappe
1dfb5eb535 feat: South Africa VAT report 2021-07-14 12:33:45 +05:30
Saqib
bb493a0602
Merge pull request #26159 from GangaManoj/asset-credit-note 2021-07-14 12:02:02 +05:30
GangaManoj
6357ffe4a1 fix: Create asset data 2021-07-13 22:31:01 +05:30