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

7190 Commits

Author SHA1 Message Date
Saif Ur Rehman
2d9da22721 Merge branch 'develop' of https://github.com/frappe/erpnext into asset-capitalization 
# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.py
#	erpnext/assets/doctype/asset/test_asset.py
#	erpnext/assets/workspace/assets/assets.json
 2021-11-04 12:48:33 +05:00
hrwx
2bce193b81 Merge branch 'develop' of https://github.com/frappe/erpnext into subscription_active_fixes 2021-11-02 14:05:10 +00:00
Saqib
ec0a72423a
fix: Calculate depreciation_amount accurately (#27585) 2021-11-02 18:45:03 +05:30
hrwx
890a786858 fix: do not generate multiple invoices 2021-11-02 11:58:01 +00:00
Anuja Pawar
d72709dd81
fix(Payment Entry): splitting outstanding rows as per payment terms (#27946) 2021-11-02 16:28:46 +05:30
Deepesh Garg
fb9e72cc8a
Merge pull request #28162 from deepeshgarg007/pan_field_missing_error 
fix: Error for missing PAN no field
 2021-10-30 19:29:26 +05:30
Deepesh Garg
541c892f97 fix: Error for missing PAN no field 2021-10-30 18:22:46 +05:30
Anuja Pawar
1a6e98ed48
fix(Payment Reconciliation): clear child tables on company/party change (#28008) 2021-10-29 20:52:47 +05:30
Deepesh Garg
eb720d18c3
Merge pull request #28145 from deepeshgarg007/coa_import_is_group 
fix: COA importer importing all accounts as group
 2021-10-29 17:04:20 +05:30
Subin Tom
75a76e634d
fix: POS consolidated invoice rounded total issue (#28006) 2021-10-29 16:45:04 +05:30
Deepesh Garg
8ccd3fee9e fix: COA importer importing all accounts as group 2021-10-29 16:08:52 +05:30
Deepesh Garg
d0e2b52f51
Merge pull request #28122 from nemesis189/consolidated-finan-report-empty-list-error 
fix: Consolidated Financial Report throws error for empty equity data list
 2021-10-29 12:11:16 +05:30
Deepesh Garg
812249e5d1 Merge branch 'develop' of https://github.com/frappe/erpnext into lower_deduction_cetificate_fixes 2021-10-28 19:01:51 +05:30
Ankush Menat
b01635e1da
refactor!: remove hub #28117 
refactor!: remove hub
 2021-10-28 14:07:15 +05:30
Subin Tom
d786855d94 fix: Consolidated Financial Report throws error for empty equity data list 2021-10-28 13:19:19 +05:30
Saqib
f530764105
Merge branch 'develop' into fix-depr-after-sale 2021-10-28 12:43:51 +05:30
Faris Ansari
c8d0d9ece9
Merge pull request #28048 from netchampfaris/print-format-builder-templates 
feat: Taxes template for selling/buying doctypes
 2021-10-28 12:33:21 +05:30
Saqib
a261d08dd8
fix: reset temporary flag after use 2021-10-27 18:30:37 +05:30
Saqib
470c07c6e9
Merge branch 'develop' into fix-depr-after-sale 2021-10-27 16:02:38 +05:30
Ganga Manoj
c9f3ea5fea
fix: Remove pointless buttons from Payment Order 
fix: Remove pointless buttons from Payment Order
 2021-10-27 15:16:38 +05:30
Saqib
2e61c5eb55
Merge branch 'develop' into fix-depr-after-sale 2021-10-27 15:12:51 +05:30
hendrik
f24ed6723e
fix(general_ledger): Order by in case Group by Account (#28093) 
* Update general_ledger.py

Fix order_by_statement if filter group by: Group by Account

* chore: whitespace

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
 2021-10-27 14:38:20 +05:30
Saqib
879a1fca76
perf(minor): improve sales invoice submission (#27916) 
* perf: skip get_pricing_rules if no pricing rule exists

* perf: fetch mode of payments data in single query

* perf: get total company stock only for purchase order

* perf: skip insertion of stock ledger entry

* fix: undo changes to allow negative stock flag

* fix: sider

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-10-27 11:42:50 +05:30
GangaManoj
06c505ddc2 fix: Linters 2021-10-27 05:23:01 +05:30
GangaManoj
cde0dae987 fix: Add flag for reverse depreciation entries 2021-10-26 21:04:06 +05:30
Deepesh Garg
7ab7753bfa Merge branch 'develop' of https://github.com/frappe/erpnext into lower_deduction_cetificate_fixes 2021-10-26 20:56:40 +05:30
GangaManoj
82bf5e5539 fix: Replace post_depreciation_entries() with make_depreciation_entry() 2021-10-26 20:53:47 +05:30
Deepesh Garg
a87c201785
Merge pull request #28054 from deepeshgarg007/tax_withholding_category_filters 
fix(minor): Filters and validations in Tax Withholding Category
 2021-10-26 20:51:24 +05:30
Deepesh Garg
6b22894275
Merge pull request #28052 from deepeshgarg007/company_address_update 
fix: Auto update company address check on linking with company
 2021-10-26 20:40:13 +05:30
Deepesh Garg
277dfeaf4e
Merge pull request #28057 from deepeshgarg007/company_change_fixes 
fix: Update receivable/payable account on company change
 2021-10-26 20:36:52 +05:30
Deepesh Garg
0136aedfdc
Merge pull request #28055 from deepeshgarg007/payment_entry_ux 
fix(UX): Add mandatory depends on condition for reference no and date fields
 2021-10-26 20:02:34 +05:30
Deepesh Garg
1165a8ac3a
Merge branch 'develop' into company_change_fixes 2021-10-26 19:52:45 +05:30
Ganga Manoj
0515b4b6f6
Merge branch 'develop' into fix-depr-after-sale 2021-10-25 19:11:19 +05:30
Subin Tom
fc8307621c
fix: POS Closing Entry without linked invoices (#28042) 2021-10-25 13:18:08 +05:30
Deepesh Garg
e6e804e7d7 fix: Get LTDS based on tax withholding category 2021-10-23 18:58:41 +05:30
Deepesh Garg
7f2dde7d94 fix: Check for supplier name 
(cherry picked from commit 944e3d467c5ab0a2a4a76a8b532e53bca77f8e61)
 2021-10-23 07:47:18 +00:00
Deepesh Garg
881e091b85 fix: Check for other properties 
(cherry picked from commit b7befe49dc83b938b74b7a63d31787734d7857f8)
 2021-10-23 07:47:18 +00:00
Deepesh Garg
2ea4c95f86 fix: Error in TDS computation summary 
(cherry picked from commit f12deae24b7ab164edd0868a1254bdf28bfeac09)
 2021-10-23 07:47:18 +00:00
Deepesh Garg
65025fb628 fix: Update receivable/payable account on company change 2021-10-21 19:30:06 +05:30
Deepesh Garg
a20058a343 fix(minor): Add mandatory depends on condition for reference no and date fields 2021-10-21 17:52:13 +05:30
Deepesh Garg
7733afc0ae fix(minor): Filters and fixes in Tax Withholding Category 2021-10-21 16:13:00 +05:30
Deepesh Garg
c6d06816cf fix: Auto update company address check on linking with company 2021-10-21 15:37:59 +05:30
Faris Ansari
8b547e39a8 feat: Taxes template for selling/buying doctypes 
Depends on the new Print Format Builder
frappe/frappe#14134
 2021-10-21 12:06:02 +05:30
rohitwaghchaure
871cb1157f
fix: consolidated report issue #28035 
fix: consolidated report issue
 2021-10-20 21:08:15 +05:30
Sagar Vora
8d9d0987fe
fix: incorrect status being set in Invoices (#28019) 
Co-authored-by: Pruthvi Patel <pruthvipatel145@gmail.com>
 2021-10-20 19:15:35 +05:30
Deepesh Garg
21ba9ac744 fix: Totals row incorrect value in GL Entry (#27867) 
(cherry picked from commit ebe68c1a7a47f5e711cc9fc1d40c07e140b76888)
 2021-10-19 09:38:40 +00:00
Saqib
ac381d21fe
fix: sider 2021-10-18 10:43:15 +05:30
Deepesh Garg
9c54d6df13
Merge pull request #27967 from deepeshgarg007/account_name_number_error 
fix: Account number and name incorrectly imported using COA importer
 2021-10-18 09:16:09 +05:30
Deepesh Garg
46e80095c6
Merge pull request #27934 from deepeshgarg007/tds_round_off_error 
fix: TDS round off not working from second transaction
 2021-10-18 08:53:37 +05:30
Deepesh Garg
b7a08535b5 fix: TDS round off not working from second transaction 2021-10-16 20:58:24 +05:30