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

6614 Commits

Author SHA1 Message Date
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
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
GangaManoj
3ea4f993b7 feat: Toggle display for discount accounting fields according to enable_discount_accounting 2021-07-06 20:22:13 +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
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
Deepesh Garg
8985231a96 fix: Rewrite tests 2021-07-06 15:34:47 +05:30
Afshan
53e3435770
fix: remove cancelled entries in consolidated financial statements (#26330) 2021-07-06 14:37:21 +05:30
GangaManoj
cf7579e29f feat: Create GL Entries for discount accounting 2021-07-06 00:36:06 +05:30
Deepesh Garg
8c1b764a90 fix: Debug tests 2021-07-05 21:49:10 +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
Deepesh Garg
9d295ca939 fix: Bank statement import 2021-07-04 20:33:36 +05:30
Deepesh Garg
5069095984 fix: Auto process deferred accounting for multi-company setup 2021-07-04 20:31:37 +05:30
Deepesh Garg
802e63a9d7 fix: Do not consider cancelled entries in party dashboard 2021-07-04 20:29:41 +05:30
Subin Tom
d2c86bb9d7 fix: Fixed Budget Variance Graph color from all black to default 2021-07-01 19:59:08 +05:30
Nabin Hait
fa006402b8 fix: merge conflict 2021-07-01 12:47:28 +05:30
Deepesh Garg
cf7af62b05 fix: Code cleanup 2021-06-30 14:14:32 +05:30
GangaManoj
d748e7f49c fix: Create common function for fetching conversion rate details of linked docs 2021-06-28 22:39:43 +05:30
GangaManoj
506d5ac3d5 fix: Make exchange rate handling more efficient 2021-06-28 22:39:43 +05:30
GangaManoj
8f52db788a fix(Purchase Invoice): Improve test for exchange rate difference handling 2021-06-28 22:39:41 +05:30
GangaManoj
3f5e7bf6d7 fix(Purchase Invoice): Fetch Purchase Receipt details using a function 2021-06-28 22:38:59 +05:30
GangaManoj
206313d69b fix(Purchase Invoice): Add test for exchange rate difference handling 2021-06-28 22:02:20 +05:30
GangaManoj
6233eaa3bb fix(Purchase Invoice): Fix condition 2021-06-28 22:00:49 +05:30
GangaManoj
785a71dcd2 fix(Purchase Invoice): Resolve difference caused by change in exchange rate 2021-06-28 22:00:49 +05:30
Saqib
4277e4c94b
fix: unreachable test case (#26234) 2021-06-28 19:10:46 +05:30
Deepesh Garg
dce2676f7a Merge branch 'develop' of https://github.com/frappe/erpnext into internal_transfer_payment_tax 2021-06-24 21:08:57 +05:30
Deepesh Garg
c151c67d97 fix: Flaky test 2021-06-24 21:08:19 +05:30
Deepesh Garg
970d2af7ad
Merge pull request #26211 from deepeshgarg007/include_dimension_filter 
fix: Account filter not working with accounting dimension filter
 2021-06-24 19:55:12 +05:30
Deepesh Garg
1564d39bf4
Merge pull request #26188 from deepeshgarg007/internal_transfer_payment_tax_v13 
fix: Taxes on Internal Transfer payment entry
 2021-06-24 19:51:48 +05:30
Deepesh Garg
e3ca177828 fix: Remove debug flag 2021-06-24 19:51:23 +05:30
Deepesh Garg
bdba29bab5 fix: Account filter not working with accounting dimension filter 2021-06-24 19:48:11 +05:30
Saqib
3b5978cdb8
Merge pull request #26093 from nextchamp-saqib/pr-item-gl-fix 
fix: purchase receipt gl entries with same item code
 2021-06-24 19:29:08 +05:30
Deepesh Garg
9382b1f154 fix: Flaky test 2021-06-24 19:03:22 +05:30
Anuja Pawar
a50196bcd9
fix: dunning permission error in payment entry (#26204) 2021-06-24 18:25:16 +05:30
Saqib Ansari
1ca8f6a51d fix: purchase receipt gl entries with same item code 2021-06-24 17:41:44 +05:30
Saqib
c10fea8a59
Merge branch 'develop' into pr-item-gl-fix 2021-06-24 17:39:36 +05:30
Deepesh Garg
e693cceb58
Merge pull request #26132 from noahjacob/shipping_address_fix 
fix: fetch preferred shipping address
 2021-06-24 17:31:21 +05:30
Noah Jacob
dbdf2515cd fix: fetches correct preferred shipping address 2021-06-24 17:06:18 +05:30
Nabin Hait
5b462ad11a fix: merge conflict 2021-06-24 15:36:51 +05:30
Nabin Hait
c1954ec72a
Merge pull request #26195 from deepeshgarg007/deferred_revenue_error 
fix: Error while booking deferred revenue
 2021-06-24 15:35:02 +05:30
Deepesh Garg
f79a72dbf3 fix: Error while booking deferred revenue 2021-06-24 14:49:09 +05:30
Deepesh Garg
ca2e914715 fix: Error while booking deferred revenue 2021-06-24 14:14:46 +05:30
Deepesh Garg
ab7a16a952
Merge pull request #26180 from deepeshgarg007/pi_billing_address_develop 
fix: Billing address not fetched in Purchase Invoice
 2021-06-24 12:13:17 +05:30
Deepesh Garg
9d8e8f8bdf fix: Do not show received amount after tax for internal tarnsfers 2021-06-24 12:02:39 +05:30
Deepesh Garg
bd9317956b fix: Taxes on Internal Transfer payment entry 2021-06-24 12:02:32 +05:30
Ganga Manoj
604f0b8f01
fix: message on successful creation of opening invoices (#25998) 2021-06-24 11:04:27 +05:30