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

4655 Commits

Author SHA1 Message Date
GangaManoj
cfff3b8726 fix: Test GL Entries made when an Asset is returned 2021-07-07 21:04:20 +05:30
GangaManoj
3a7f25b218 fix: Make functions more readable 2021-07-07 15:59:52 +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
GangaManoj
f8ee8058e7 fix(Sales Invoice): Reset disposal_date on returning the Asset 2021-07-02 15:45:52 +05:30
GangaManoj
4cf3d9ac20 fix(Sales Invoice): Let invoice be created for Sold Assets if it's a return invoice 2021-07-02 15:25:04 +05:30
GangaManoj
88348e2da7 fix(Sales Invoice): Print appropriate message if Asset isn't specified when the Item is a Fixed Asset 2021-06-23 11:57:53 +05:30
GangaManoj
32d7b1f6ad fix(Sales Invoice): Fix GL Entry creation for Return Invoices linked with Assets 2021-06-23 11:24:05 +05:30
GangaManoj
8127208774 fix(Sales Invoice): Reset Asset status on issuing Credit Note 2021-06-22 23:12:56 +05:30
GangaManoj
721ff9438a Merge branch 'develop' into asset-credit-note 2021-06-22 22:45:11 +05:30
GangaManoj
d0d5fedd48 fix(Sales Invoice): Print appropriate message if item.asset is missing when the Item is a Fixed Asset 2021-06-22 00:22:08 +05:30
GangaManoj
5b07e58412 fix(Sales Invoice): Let invoice be created for Sold Assets if it's a return invoice 2021-06-21 23:51:09 +05:30
GangaManoj
600333875a fix(Sales Invoice): Let item.asset be copied on duplicating the doc 2021-06-21 23:41:35 +05:30
Afshan
127d637b3d
fix: check for duplicate payment terms in Payment Term Template (#25999) 2021-06-21 11:24:45 +05:30
Saqib
7ff19ebec8
fix(pos): unsupported operand type -= for 'float' and 'NoneType' (#26096) 2021-06-21 10:48:50 +05:30
Rohit Waghchaure
110e152fa3 fix: purchase invoice qty change not recalculate the consumed qty and added test cases for purchase invoice 2021-06-20 15:28:23 +05:30
Rohit Waghchaure
7b7ceaadd9 feat: subcontract code refactor and enhancement 2021-06-20 15:27:01 +05:30
Subin Tom
c03a947e98 fix: removed extra space from label rate 2021-06-16 19:47:55 +05:30
Nabin Hait
0950481253 fix: merge conflict 2021-06-15 20:18:06 +05:30
Deepesh Garg
95bc141531
Merge pull request #26056 from deepeshgarg007/gst_taxtable_value_with_discount_v13 
fix(India): Taxable value for invoices with additional discount
 2021-06-15 12:05:16 +05:30
Deepesh Garg
433815daba fix: Update einvoice json test 2021-06-14 20:43:51 +05:30
Deepesh Garg
ac52daa14f fix: Import throw 2021-06-14 20:09:23 +05:30
Deepesh Garg
5ef9a62917 fix: Add separate function to validate payment entry taxes 2021-06-14 20:09:17 +05:30
Deepesh Garg
302855e160 fix: Auto tax calculations in Payment Entry 2021-06-14 20:09:10 +05:30
Ankush Menat
9891780f5a
perf(minor): remove unnecessary comprehensions (port #25645) 2021-06-11 18:40:22 +05:30
Nabin Hait
d17217c4e2
Merge pull request #25831 from deepeshgarg007/tds_advance_payment_v13 
feat: Tax deduction against advance payments
 2021-06-10 20:25:30 +05:30
Deepesh Garg
3b34fc4cce Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13 2021-06-10 18:57:31 +05:30
Deepesh Garg
5434dd048b Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into dynamic_gst_rates 2021-06-10 18:56:39 +05:30
Deepesh Garg
d063f9a5d1 fix: GL Entry ordering 2021-06-10 12:26:21 +05:30
Deepesh Garg
0b5fe1b5eb fix: Failing test case 2021-06-10 10:34:49 +05:30
Deepesh Garg
911818a9e2 fix: Add multiple fixes 2021-06-09 22:55:10 +05:30
Saqib
42557c4ad3
feat: cost-center wise period closing entry (#25766) 2021-06-09 19:48:31 +05:30
Saqib
26f0609390
feat: enable/disable gl entry posting for change given in pos (#25822) 2021-06-09 19:47:28 +05:30
Deepesh Garg
9e648183db fix: Test case 2021-06-09 18:26:16 +05:30
Deepesh Garg
7dabb6be30 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13 2021-06-09 18:10:55 +05:30
Deepesh Garg
b57ebba3fd
fix: Validate negative allocated amount in Payment Entry (#25799) 2021-06-09 17:56:41 +05:30
Deepesh Garg
4c1dad8207 fix: Debug tests 2021-06-09 14:18:23 +05:30
Deepesh Garg
8090965162 fix: Debug test 2021-06-09 13:45:42 +05:30
Deepesh Garg
758db793be Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13 2021-06-09 13:39:07 +05:30
Anupam Kumar
21b8e2f0d8
fix: hiding Rounding Adjustment field (#25380) 
* fix: hiding Rounding Adjustment field

* fix: updating purchase_invoice.json
 2021-06-09 12:57:21 +05:30
Deepesh Garg
e4fcc5562f refactor: Advance taxes and charges calculation 2021-06-08 16:35:47 +05:30
Anuja Pawar
d4398fd84a
fix: update cost center from pos (#25971) 2021-06-07 16:20:21 +05:30
Deepesh Garg
6f2dacc60c Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13 2021-06-06 19:31:50 +05:30
Deepesh Garg
18be767f75 fix: Remove invalid test 2021-06-06 13:25:34 +05:30
Deepesh Garg
e8a78bd43d fix: Add test cases 2021-06-05 13:16:39 +05:30
Saqib Ansari
81b9a5ee47 fix(pos): cannot cancel consolidated sales invoice 2021-06-03 12:59:09 +05:30
Fisher Yu
865663857c
fix: chart of accounts importer always error (#25882) 
* fix: chart of accounts importer always error 

chart of accounts importer always error Parent Account Missing

* Update chart_of_accounts_importer.py
 2021-06-01 12:15:58 +05:30
Deepesh Garg
2f5885627d fix: Labeling and other fixes 2021-06-01 11:07:18 +05:30
Ganga Manoj
908b0090e9
fix: Create POS Invoice for Product Bundles (#25847) 
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-05-31 19:49:03 +05:30
Nabin Hait
a3d1b6973a fix: merge conflict 2021-05-31 11:21:33 +05:30
Saqib
89f621baa4
fix(pos): closing entry shows incorrect expected amount (#25868) 2021-05-31 09:56:49 +05:30