Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,663 Commits 3 Branches 0 Tags 1 GiB
564d23fa8d
Commit Graph

7257 Commits

Author SHA1 Message Date
Deepesh Garg
64f68d5e94
Merge branch 'develop' into deferred_report_revenue_and_expense 2021-12-15 14:14:34 +05:30
Subin Tom
5c4d3f89d2
feat: 'Invoice Number' field in Opening Invoice Creation Tool (#28844) 2021-12-15 14:14:16 +05:30
Subin Tom
be103ab8e6
fix: Currency fix for cost field in subscription plan (#28821) 2021-12-15 13:01:48 +05:30
ruthra
9ec8841b91 refactor: rename checkbox and translations 
- rename checkbox and make it
 - added translation text for labels
 - fixes for linter error
 2021-12-14 20:59:14 +05:30
ruthra
a8a598ace7 refactor: remove unused function 'get_postings' 2021-12-14 16:34:51 +05:30
Saqib
c3e0de28b1
fix: validate if asset account is set against company 2021-12-13 20:13:53 +05:30
Deepesh Garg
b966c45fa8
Merge pull request #28748 from deepeshgarg007/accounts_receivable_jv_due_date 
fix: Ageing in AR/AP report for advances
 2021-12-12 17:27:21 +05:30
Deepesh Garg
a6fba7f128
Merge pull request #28764 from deepeshgarg007/tds_report_fixes 
fix: TDS Monthly payable report
 2021-12-12 17:11:58 +05:30
ruthra
c3453cd73c feat: Deferred Revenue and Expense report 
- show deferred revenue and expense with actual and expected postings
 - unit tests added
 2021-12-10 19:30:43 +05:30
Ankush Menat
d37541d3fb fix: ensure that reposting is finished before freezing stock/account 2021-12-10 12:31:49 +05:30
Sagar Sharma
6485ac4e59
fix: misleading "Set Default X" fields after saving (#28798) 
* fix: misleading "Set Default X" fields after saving

* refactor: remove unncessary code and minor formatting

* fix: extend to more doctypes and correct fieldnames

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-12-09 17:04:00 +05:30
Deepesh Garg
3e1591c145
Merge pull request #28731 from deepeshgarg007/better_deferred_revenue_error_logging 
fix: Better Error logging for deferred revenue/expense booking
 2021-12-07 15:42:05 +05:30
Deepesh Garg
d106d59c3f fix: TDS Monthly payable report 2021-12-06 20:36:48 +05:30
Deepesh Garg
3dabac15ed fix: Ageing in AR/AP report for advances 2021-12-06 15:05:20 +05:30
Deepesh Garg
3c64e201cc fix: Log error before throwing exception 2021-12-04 20:05:37 +05:30
Deepesh Garg
0ba4fcee2a fix: Commit joural entries 2021-12-04 19:25:44 +05:30
Deepesh Garg
67a001d876 fix: Better Error logging fordeferred revenue/expense booking 2021-12-04 19:19:03 +05:30
Deepesh Garg
f12be3001d fix: Taxes and Charges template not getting copied from Purchase Order/Receipt to Invoice 
(cherry picked from commit 6a75e8d283bb76214af832bb0a29c20eefae328c)
 2021-12-03 04:12:42 +00:00
Deepesh Garg
107fb43d6a fix: Paid showing in AR/AP report 
(cherry picked from commit 5e7ce5370f6af634f7674772529cf4933114f3ef)
 2021-12-02 13:44:27 +00:00
Ankush Menat
fdffa037b5
test: dynamic fiscal year creation in tests (#28667) 2021-12-01 17:31:17 +05:30
Dany Robert
3708cf17ad
fix(POS Profile): replace cur_frm with frm (#28390) 2021-12-01 12:14:06 +05:30
mergify[bot]
071118fa4e
fix: Unable to search project by project name in Sales Invoice (bp #28648) 
(cherry picked from commit 08b7c856b2ee94d1f8ac2c019c556eef4d7dd7da)

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-11-30 13:15:20 +00:00
Deepesh Garg
ad8d296c08
Merge pull request #28636 from deepeshgarg007/zero_values_report 
feat: Show Zero Values filter in consolidated financial statement
 2021-11-30 18:15:50 +05:30
Raffael Meyer
e10ab1626c
feat: Grant commission on certain items only (#27467) 
Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2021-11-30 17:54:18 +05:30
Deepesh Garg
9610086d0c feat: Show Zero Values filter in consolidated financial statement 2021-11-30 13:24:23 +05:30
Ankush Menat
f862339024 fix: use get_all instead of get_list for child tables 2021-11-29 13:04:29 +05:30
xdlumertz
cdaf0a04cf
fix(ux): allow translations (#28455) 
* Translation

* Translations

Co-authored-by: xdlumertz <alexandrelumertz@gmail>
 2021-11-27 15:03:35 +00:00
Deepesh Garg
38dfb60243
Merge pull request #27348 from deepeshgarg007/advance_tds_allocation_gl 
fix (refactor): Tax Withholding for Advances using Payment Entry against suppliers
 2021-11-26 14:28:50 +05:30
Saqib
9c913c9b2d
fix: over billing validation (#28218) 2021-11-26 12:00:13 +05:30
Deepesh Garg
f07f010962 fix: Add tests 2021-11-25 23:58:16 +05:30
Deepesh Garg
5ba3b28d69 fix(refactor): Advance tds allocation to purchase invoice 2021-11-25 15:42:30 +05:30
Ganga Manoj
5ef2330022
fix: Replace 'parent' with 'invoice_or_item' (#28513) 2021-11-23 12:28:41 +05:30
Ganga Manoj
7d0558e202
fix: Add extra column to display Invoice or Item when grouped by Invoice (#28380) 2021-11-22 12:34:46 +05:30
Saqib
cb52e6dd6b
fix: cost center wise ledger posting for pcv (#28477) 2021-11-22 12:24:32 +05:30
Saqib
78851ecb70
feat: create party link from customer/supplier (#28387) 
* feat: create party link from customer/supplier

* test: create_party_link method
 2021-11-22 12:23:23 +05:30
Saqib
7677d6d4c3
Merge pull request #28402 from GangaManoj/gross-profit-percentage 
fix: Gross Profit report totals
 2021-11-22 12:21:22 +05:30
Ahmed Shareef
3a2074ce05
fix: add child button in coa tree (#28413) 2021-11-22 11:46:58 +05:30
Saqib
08ad93d82f
fix: coa balance rendering bug (#28468) 2021-11-20 15:15:46 +05:30
Deepesh Garg
a57d39909e
Merge pull request #28302 from nemesis189/shipping-rule-updation-error 
fix: Shipping Rule picking up old net_rate
 2021-11-19 08:21:53 +05:30
Ganga Manoj
5d8a85db10
Merge branch 'develop' into gross-profit-percentage 2021-11-17 19:23:34 +05:30
rohitwaghchaure
b9c8489de6
Merge pull request #28417 from rohitwaghchaure/currency-wise-pricing-rule-not-working 
fix: currency wise pricing rule not working
 2021-11-17 14:02:19 +05:30
Rohit Waghchaure
43aeb541c2 fix: currency wise pricing rule not working 2021-11-17 13:30:17 +05:30
Sagar Vora
c00d0a3e24
fix: better validation for Integration Request (#28186) 2021-11-16 20:31:18 +05:30
Subin Tom
a8e2c02e14 fix: fixed tests, separated a method for shipping charges 2021-11-16 19:06:49 +05:30
Marica
6bd0c1dbf1
Merge pull request #28269 from marination/pr-return-ux 
refactor:  (ux) Accepted/Rejected/Received Qty UX
 2021-11-16 18:00:42 +05:30
Subin Tom
a1807a2f98
fix: POS idx issue in taxes table while merging (#28389) 2021-11-16 17:46:26 +05:30
Saqib
5f30104e00
Merge branch 'develop' into gross-profit-percentage 2021-11-16 16:00:07 +05:30
Marica
4afcbfdc08
Merge branch 'develop' into pr-return-ux 2021-11-16 15:15:48 +05:30
marination
293f6cbafd fix: Sider, Linter and Server Side Test 
- Fix Server side PR test
- linter: re-arrange imports
- sider: avoid single line multi statement
- Code cleanup: Improve code readability and avoid horizontal scroll in test_purchase_receipt
- Removed unused variables in test_purchase_receipt
 2021-11-16 14:36:15 +05:30
Ahmed Shareef
952fc87c99
refactor: fix help section background in dark mode (#28406) 2021-11-16 14:30:13 +05:30