Deepesh Garg
30a647ff80
fix: Handle frozen books while handling
2022-01-07 19:52:38 +05:30
Deepesh Garg
2aea078699
Merge branch 'develop' of https://github.com/frappe/erpnext into deferred_revenue_multi_currency_jv
2022-01-07 19:06:16 +05:30
Deepesh Garg
2de5122262
fix: Add iteritems back
2022-01-07 18:30:19 +05:30
Deepesh Garg
00055bb159
fix: Conflicts
2022-01-07 18:11:38 +05:30
Deepesh Garg
14689a51f4
Merge branch 'develop' of https://github.com/frappe/erpnext into deferred_revenue_multi_currency_jv
2022-01-07 16:49:57 +05:30
ruthra
fe4d7f86ee
fix: deferred report division by zero exception
2022-01-07 16:30:56 +05:30
Deepesh Garg
bf5930c4bb
fix: Show GL balance in Accounts Receivable and payable summary
...
(cherry picked from commit 1d270dca05501b5a15d19e3270188029b48eafde)
# Conflicts:
# erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py
2022-01-07 09:35:19 +00:00
Deepesh Garg
f6f449ed18
Merge pull request #29176 from deepeshgarg007/outstanding_amount_anomaly
...
fix: Inconsistency in calculating outstanding amount
2022-01-07 13:28:52 +05:30
Deepesh Garg
9d3a5c3184
fix: Inconsistency in calculating outstanding amount
2022-01-06 18:58:49 +05:30
Deepesh Garg
80dce1ab73
Merge pull request #29125 from nextchamp-saqib/fix-reverse-jv
...
fix: cannot create reverse journal entry
2022-01-06 13:30:50 +05:30
ruthra
ca17c7226c
fix: get project from PO into payment entry
2022-01-06 11:34:47 +05:30
Saqib Ansari
fbd706f232
fix: existing party link validation ( #29159 )
2022-01-05 17:55:08 +05:30
Subin Tom
3febca1a9a
fix: Modifying Opening invoice creation tool timestamp ( #29127 )
2022-01-04 19:37:44 +05:30
Saqib Ansari
f4db474be0
fix: minor issues ( #29130 )
2022-01-04 19:12:19 +05:30
Chillar Anand
0900c3d655
refactor: Removed agriculture module from ERPNext ( #29022 )
2022-01-04 17:26:11 +05:30
Deepesh Garg
e311667a25
fix: Test case
2022-01-04 16:24:24 +05:30
Saqib Ansari
3aa1817f7b
fix: cannot create reverse journal entry
2022-01-04 14:43:02 +05:30
Deepesh Garg
094158f287
fix: Add test case for multicurrency invoice
2022-01-04 14:04:18 +05:30
Deepesh Garg
98f294a8ae
fix: Deferred revenue booking for multi currency invoices via JV
2022-01-03 19:40:47 +05:30
Saqib Ansari
7e777356ee
Merge pull request #28160 from resilient-tech/fix-invoice-statuses
...
refactor: `update_invoice_status` with query builder
2022-01-03 17:59:11 +05:30
Subin Tom
7385497219
fix: using get_batch_qty method to get available_qty
2022-01-03 16:57:00 +05:30
Subin Tom
9e20fa85c1
fix: Removed validate_non_stock_items, filter_service_items methods
2022-01-03 14:46:53 +05:30
Saqib Ansari
568550874d
Merge branch 'develop' into pos-batch-no-stock-validation
2022-01-03 14:46:29 +05:30
Saqib Ansari
d0f5beeb34
fix: filter query in bank reconciliation tool ( #29098 )
2022-01-03 11:33:03 +05:30
Deepesh Garg
c3d890f3f1
fix: get fiscal year based on date
2022-01-02 19:10:49 +05:30
Deepesh Garg
4b6217a683
fix: Test Case
...
(cherry picked from commit 342658ea7028cc0d890200364cc08cf97e55d6d0)
# Conflicts:
# erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
2022-01-02 13:36:43 +00:00
Deepesh Garg
db829a0610
Merge pull request #29050 from mohsinalimat/patch-1
...
feat: Add currency in import download statement
2022-01-02 17:15:01 +05:30
Dany Robert
321730a88e
Merge branch 'develop' into ledger-merger
2021-12-31 13:02:12 +05:30
MohsinAli
72369092a3
Merge branch 'develop' into patch-1
2021-12-30 17:13:59 +05:30
Saqib Ansari
689e08aca3
Merge branch 'develop' into pos-service-items
2021-12-29 14:55:20 +05:30
Pruthvi Patel
fc0dd3fcd7
Merge branch 'develop' into fix-invoice-statuses
2021-12-29 13:45:35 +05:45
Deepesh Garg
6405699821
Merge branch 'develop' into mergify/bp/develop/pr-28996
2021-12-28 14:46:12 +05:30
Deepesh Garg
6f933db3cc
fix: Deferred revenue test case
2021-12-28 14:16:19 +05:30
Deepesh Garg
057cfb22d6
fix: Remove debug statement
...
(cherry picked from commit becb39da902e7e113c3dacb7eee7921144b8e99d)
2021-12-28 08:11:18 +00:00
Deepesh Garg
d807d78313
fix: Issues in Bank Reconciliation tool
...
(cherry picked from commit ff183ee895fb0dd1ca595eb76e2286695063315a)
2021-12-28 08:11:18 +00:00
MohsinAli
a0863d1cb1
feat: Add currency in import download statement
...
Add currency in bank statement import
2021-12-28 10:27:19 +05:30
Subin Tom
ec37930404
fix: Allowing non stock items in POS
2021-12-22 19:14:47 +05:30
Pruthvi Patel
617f7565ce
Merge branch 'develop' into fix-invoice-statuses
2021-12-21 22:16:14 +05:45
Saqib
7f786e44a1
Merge branch 'develop' into pos-batch-no-stock-validation
2021-12-21 17:05:43 +05:30
Saqib
c3a9ca09d1
chore: remove extra whitespace
2021-12-21 17:05:36 +05:30
Saqib
9c8f523537
fix: typo
2021-12-21 17:01:10 +05:30
Ganga Manoj
1ed30ee7c7
fix: Reset value_after_depreciation on reversing journal entry during Asset return
2021-12-21 13:59:53 +05:30
Ankush Menat
d7148adee5
test: remove unnecessary creation of companies #28965
...
test: remove unnecessary creation of companies
2021-12-20 22:00:31 +05:30
Deepesh Garg
c5c7777bd5
Merge pull request #28959 from deepeshgarg007/consolidated_balance_return_fix
...
fix: Error on viewing consolidated financial statement
2021-12-20 17:13:12 +05:30
Ankush Menat
f5d5281119
chore: drop deprecated qunit tests
2021-12-20 17:03:10 +05:30
Deepesh Garg
5d6199cf35
fix: Error on viewing consolidated financial statement
2021-12-20 16:54:52 +05:30
Pruthvi Patel
4d48ca4228
test: update_invoice_status
2021-12-20 13:23:14 +05:30
Dany Robert
c68b2c3763
Merge branch 'develop' into currency-exchange-settings
2021-12-18 18:32:12 +05:30
Saqib
1abdcf2bea
Merge branch 'develop' into multiple-pricing-rule-fix
2021-12-18 12:13:33 +05:30
Dany Robert
e75295a151
Merge branch 'develop' into ledger-merger
2021-12-18 11:32:20 +05:30
Dany Robert
ab7f38224f
fix: remove db commit
2021-12-17 16:42:24 +00:00
Dany Robert
32e5db7cb8
chore: styling according to linter
2021-12-17 16:38:16 +00:00
Dany Robert
399446460a
feat: tests
2021-12-17 16:18:42 +00:00
Subin Tom
e85da7a03a
fix: Add Invoice Number field to list view in Opening Inv Creation Tool ( #28938 )
2021-12-17 21:48:10 +05:30
Dany Robert
b3a3367d1d
feat: allow group accounts
2021-12-17 13:06:30 +00:00
Deepesh Garg
6ab753015e
fix: Add tests for multicurrency subscription
2021-12-16 17:38:29 +05:30
Deepesh Garg
0e4842b986
fix: Multicurrency invoices using subscription
2021-12-16 16:51:41 +05:30
Subin Tom
9f235526d4
fix: Validation in POS for item batch no stock quantity
2021-12-15 22:34:44 +05:30
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
Saqib Ansari
5a7a9a598b
chore: rename redefinition of multiple pricing rule test
2021-12-15 10:32:23 +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 Ansari
c0d1f4869f
test: add test_multiple_pricing_rules
2021-12-14 14:58:31 +05:30
Saqib Ansari
1e17d6a607
fix: qty filter not working if apply_multiple_pricing_rules is enabled
2021-12-14 14:58:20 +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
Dany Robert
75de5be53e
fix: import issue and minor fixes
2021-12-10 10:27:15 +00:00
Dany Robert
614b9270e7
fix: convert whitespace to tabs
2021-12-10 09:45:00 +00:00
Dany Robert
7554f11260
feat: progress bar, account name field
2021-12-10 08:45:47 +00:00
Ankush Menat
d37541d3fb
fix: ensure that reposting is finished before freezing stock/account
2021-12-10 12:31:49 +05:30
Dany Robert
b7cc20eac0
Merge branch 'develop' of https://github.com/rtdany10/erpnext into ledger-merger
2021-12-09 15:26:45 +00:00
Dany Robert
75f8117daf
feat: merge functionality
2021-12-09 15:23:10 +00:00
Dany Robert
57a7633f9b
feat: form updates and progressbar
2021-12-09 15:22:46 +00:00
Dany Robert
ad5d7897a8
feat: ledger merger doctype
2021-12-09 13:31:54 +00:00
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
Dany Robert
0592096c62
Merge branch 'develop' into currency-exchange-settings
2021-12-07 22:36:36 +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
Deepesh Garg
0931d17a2a
Merge branch 'develop' into currency-exchange-settings
2021-11-23 12:39:25 +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
Marica
0afcdecb9b
Merge branch 'develop' into e-commerce-refactor-develop
2021-11-16 17:58:53 +05:30
Subin Tom
a1807a2f98
fix: POS idx issue in taxes table while merging ( #28389 )
2021-11-16 17:46:26 +05:30
marination
f9929ed8a6
Merge branch 'develop' of https://github.com/frappe/erpnext into e-commerce-refactor-develop
2021-11-16 16:06:07 +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
marination
e9c75d6eea
test: Purchase Invoice Received Qty
2021-11-16 11:55:34 +05:30
Rohit Waghchaure
d82910b08a
fix: Pricing Rule not created against the Promotional Scheme
2021-11-16 10:27:59 +05:30
GangaManoj
1affa12b74
fix: Replace 'Totals' with 'Total'
2021-11-16 03:36:47 +05:30
GangaManoj
508a2301ee
fix: Display totals row in bold
2021-11-16 03:22:04 +05:30
GangaManoj
c7ffe3a7b4
fix: Remove unnecessary condition
2021-11-16 02:36:58 +05:30
GangaManoj
582a7ae964
fix: Add totals row when Grouped By Invoice
2021-11-16 02:33:51 +05:30
GangaManoj
3aaf7cb408
fix: Remove default Totals row
2021-11-16 02:33:12 +05:30
marination
afe1c45f7f
fix: Sider + Fields UX
...
- remove extra space (sider)
- PR: Bring rejected qty in grid view
- PI: Rename `Stock Qty` to `Accepted Qty in Stock UOM`
- PI: Move `Accepted Qty in Stock UOM` under Stock UOM
2021-11-15 17:17:29 +05:30
Dany Robert
3f8ad54c5c
Merge branch 'develop' into currency-exchange-settings
2021-11-13 13:13:15 +05:30
Dany Robert
e50893e991
fix: eslint brace style issue
2021-11-13 13:12:38 +05:30
Deepesh Garg
829f92f10a
Merge pull request #28363 from deepeshgarg007/default_party_account
...
fix: Default party account getting overriden in invoices
2021-11-12 13:04:21 +05:30
Deepesh Garg
88648570d7
fix: Default party account getting overriden in invoices
2021-11-12 12:39:30 +05:30
rohitwaghchaure
0157da57b5
Merge pull request #28308 from rohitwaghchaure/commision-rate-not-fetch-from-sales-person
...
fix: commission rate not fetch from sales person
2021-11-11 19:11:31 +05:30
Saqib
ecbe4b16b8
perf(minor): general ledger report ( #27987 )
2021-11-11 13:55:21 +05:30
Saqib
6d05bb5274
fix(pos): get mode of payments query ( #28321 )
2021-11-10 13:06:55 +05:30
Anuja Pawar
2f004693c3
fix(Bank Reconciliation): get credit amount for bank account of type liability
2021-11-10 12:36:54 +05:30
Rohit Waghchaure
4d4bfa2333
fix: commision rate not fetch from sales person
2021-11-10 00:00:38 +05:30
Deepesh Garg
8a253ed1f3
Merge pull request #28238 from nextchamp-saqib/perf-financial-statements
...
perf: improve financial statement loading time
2021-11-09 16:29:58 +05:30
Saqib
4a3cef6436
fix: update 'current_invoice_end' after processing invoice ( #28278 )
2021-11-09 14:16:38 +05:30
Dany Robert
01e7076b65
Merge branch 'develop' into currency-exchange-settings
2021-11-06 09:59:00 +05:30
Ankush Menat
8fe5feb6a4
chore: remove all six compat code
2021-11-05 11:16:29 +05:30
Ankush Menat
897e90ac55
chore: remove past module dependencies
2021-11-05 11:16:29 +05:30
Ankush Menat
6098e92ba9
chore: remove utf-8 compat code
2021-11-05 11:16:29 +05:30
Dany Robert
4716523c77
fix: sider issues
2021-11-04 05:38:00 +00:00
Dany Robert
4a0f2175ad
fix: pre-commit issues
2021-11-04 05:25:48 +00:00
Dany Robert
e65a76b214
chore: clean up
2021-11-04 05:04:10 +00:00
Dany Robert
08b2735a79
fix: make fields editable only when service provider is custom
2021-11-04 05:01:37 +00:00
Dany Robert
7291d9f236
feat: option for preconfigured selectable service providers
2021-11-03 14:13:22 +00:00
Saqib Ansari
b7a44fe0a3
perf: improve financial statement loading time
2021-11-03 18:17:31 +05:30
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
Deepesh Garg
17a8649500
fix: Account number and name incorrectly import using COA importer
2021-10-15 21:19:41 +05:30
Subin Tom
f3cf36f613
fix: POS Profile payment methods table ( #27956 )
...
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
2021-10-15 12:39:52 +05:30
Ganga Manoj
5a0289a810
Merge branch 'develop' into fix-depr-after-sale
2021-10-14 22:37:07 +05:30
Marica
ee25ba07a2
Merge pull request #27947 from marination/si-dn-sn-mismatch
...
fix: Improve error message for Serial No mismatch between SI and DN
2021-10-14 13:49:04 +05:30
Ganga Manoj
8cc81a96fc
Merge branch 'develop' into fix-depr-after-sale
2021-10-14 03:12:44 +05:30
GangaManoj
8ea1ad9232
fix: Only validate against JV if it's not a reverse depreciation entry
2021-10-13 20:47:39 +05:30
marination
60f35ad8a2
fix: Remove trailing space and line break in translatable string
2021-10-13 16:50:10 +05:30
marination
646acb6b46
fix: Improve error message for Serial No mismatch between SI and DN
2021-10-13 16:41:11 +05:30
Noah Jacob
2bb383b178
fix: not authorized to update entries after freezing accounts ( #27937 )
...
* fix: not authorized to update entries after freezing accounts
* fix: Add test case
* fix(patch): patched to requeue failed reposts(check_freezing_date)
* chore: misc fixes
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
2021-10-13 16:20:08 +05:30
Shariq Ansari
790c1cda6f
fix: Removing unused fields from workspace JSON files #27612
...
fix: Removing unused fields from workspace JSON files
2021-10-13 16:18:20 +05:30
Deepesh Garg
bd310e2816
Merge pull request #27783 from hrwX/subscription_generation_fix_develop
...
fix(Subscription): reorder updation of end date
2021-10-13 15:21:50 +05:30
Deepesh Garg
ca0067212d
fix: TDS round off not working from second transaction
2021-10-13 12:00:25 +05:30
Deepesh Garg
0b263c5100
Merge pull request #27927 from Anuja-pawar/invoice-sections
...
fix: minor ux fixes in Sales & Purchase Invoice
2021-10-12 23:05:48 +05:30
Deepesh Garg
b990d5b112
Merge pull request #27545 from nextchamp-saqib/pay-received-amt-fix
...
fix: cannot add deductions in internal transfer payment entry
2021-10-12 23:04:04 +05:30
Deepesh Garg
3b9514d6e1
fix: Update message string
2021-10-12 21:49:51 +05:30
Anuja Pawar
b7769c733e
Merge branch 'develop' into invoice-sections
2021-10-12 21:32:01 +05:30
Anuja Pawar
d181cc42a1
fix: set collapsible & print hide
2021-10-12 20:57:08 +05:30
Ankush Menat
4ebae7c5dc
Merge branch 'develop' into optimize-get-item-details
2021-10-12 20:39:49 +05:30
marination
fd6f3c6b88
Merge branch 'develop' of https://github.com/frappe/erpnext into e-commerce-refactor-develop
2021-10-12 18:24:21 +05:30
Ankush Menat
8d69ec72a6
fix: remove transaction commit from tests
2021-10-12 16:17:15 +05:30
marination
37a246e738
chore: Patches for Website Item
...
- Patch to make website item from item
- Patch to move Products and Shopping Cart Settings into E Commerce Settings
- Patch to move products in Homepage from Item to Website Item
- Minor cleanup, replacing/removing references to Item website fields (obsolete)
2021-10-12 16:16:17 +05:30
marination
025574d9b5
chore: Removing Item's Website section & references
...
- Removed old onboarding slide json and `create_onboarding_docs` methods
- Removed website sections from Item master
- Removed references to item website fields
- Shifted Item doctype website methods to Website Item
- Removed WebsiteGenerator from Item doctype
- Website Items in Homepage Products section
- Removed redundant code from item_group.py
- Fix: Item field filters won’t appear in website
2021-10-12 16:03:19 +05:30
marination
eef9cf152f
chore: Drive E-commerce via Website Item
...
- Removed Shopping Cart Settings
- Portal fully driven via E Commerce Settings
- All Item listing querying will happen via ProductQuery engine only
- Product Listing via Website Items
- removed redundant code
- Moved all website logic from Item to Website Item
2021-10-12 15:48:06 +05:30
Anuja Pawar
2bc1ca993a
fix: keeping sections consistent across sales & purchase invoice
2021-10-12 14:52:40 +05:30
Saqib Ansari
7b691beabb
perf: fetch mode of payments data in single query
2021-10-12 13:28:31 +05:30
Saqib Ansari
a500252570
perf: skip get_pricing_rules if no pricing rule exists
2021-10-12 13:25:55 +05:30
Afshan
569dc5f6b1
fix: add cost center in gl entry for advance payment entry ( #27840 )
2021-10-12 13:23:20 +05:30
Chillar Anand
401e22fb8d
fix(accounts): Fix issue with fetching loyalty point entries ( #27892 )
2021-10-12 10:28:36 +05:30
Anuja Pawar
e1967870a9
Merge pull request #27906 from Anuja-pawar/accounts-settings
...
fix(Accounts Settings): Update label
2021-10-12 10:27:23 +05:30
Dany Robert
7acdcc70ad
fix: v12 migrate error - unknown column ‘mandatory_depends_on’ ( #27897 )
...
* fix: v12 doesn't have mandatory_depends_on field
* fix: move update_vehicle_no_reqd_condition to v13
* fix: move update_vehicle_no_reqd_condition to v13
* fix: file name missing .py
* refactor!: add back empty line
* fix: linters issue
2021-10-11 15:05:55 +05:30
rohitwaghchaure
3f99a87e3d
Merge pull request #27863 from rohitwaghchaure/multi-currency-issue-for-consolidated-report
...
fix: consolidated report not consider company currency
2021-10-11 14:06:08 +05:30
Deepesh Garg
1aba3592fa
Merge pull request #27369 from Havenir/ksa-vat
...
feat(regional): KSA E-Invoicing and VAT Report
2021-10-11 12:16:51 +05:30
Rohit Waghchaure
19d14da0d4
fix: opening balance to calculate 'Unclosed Fiscal Years Profit / Loss (Credit)'
2021-10-10 14:00:25 +05:30
Himanshu
4f5d82c817
Merge branch 'develop' into subscription_generation_fix_develop
2021-10-09 09:39:27 +01:00
Himanshu
44306bd0e5
Update subscription.py
2021-10-09 09:37:54 +01:00
Rohit Waghchaure
dc4206428d
fix: consolidated report not consider company currency
2021-10-08 12:10:35 +05:30
Anuja Pawar
5cc3ea0aa7
fix(Payment Reconciliation): minor ux fixes ( #27779 )
...
* fix: minor fixes
* fix: Linters check
* fix: sider check
* fix: kept unallocated payment amount hidden in allocation
* fix: removed Add row button from the tables (redundant)
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2021-10-07 21:09:15 +05:30
Himanshu
951ab9f78f
Merge branch 'develop' into subscription_generation_fix_develop
2021-10-06 19:22:40 +01:00
Chillar Anand
772d4753e7
refactor: Clean up mutable defaults and add CI check ( #27828 )
...
* refactor: Clean up mutable defaults and add CI check
2021-10-06 16:58:48 +00:00
hrwx
ae657c7e4e
fix: create past invoices
2021-10-06 17:32:39 +01:00
Sagar Vora
656015d99d
test: use test_dependencies instead of duplication
2021-10-06 16:46:01 +01:00
Sagar Vora
fc375c5bde
fix: remove newline
2021-10-06 16:46:01 +01:00
hrwx
0f03b19109
fix: reorder updation of end date
2021-10-06 16:46:01 +01:00
Marica
ff7506d4a6
fix: revert "fix: missing link in dashboard missing on SI from DN" ( #27832 )
2021-10-06 13:35:22 +05:30
Marica
2691a15c91
Merge pull request #27360 from FHenry/dev_fix_27359
...
fix: missing link in dashboard missing on SI from DN
2021-10-06 13:04:50 +05:30
GangaManoj
273fccf0dd
fix: Add test for depreciation on return of sold Asset
2021-10-06 02:08:28 +05:30
GangaManoj
f51bd44929
fix: Unlink Depreciation Entry made on sale if the Asset is returned
2021-10-06 01:18:05 +05:30
GangaManoj
62fea8a5aa
fix: Rename tests
2021-10-05 21:38:39 +05:30
Deepesh Garg
91bf40d692
Merge pull request #27811 from frappe/mergify/bp/develop/pr-27792
...
fix: COA Importer showing blank validations (backport #27792 )
2021-10-05 21:23:21 +05:30
Afshan
cec66d2d10
fix: removed redundant piece of code ( #27817 )
2021-10-05 19:14:39 +05:30
Deepesh Garg
fee54023a6
Merge branch 'develop' into mergify/bp/develop/pr-27792
2021-10-05 17:22:24 +05:30
mergify[bot]
233bf5dd29
fix: using DN for transfer w/o internal customer (backport #27798 ) (backport #27805 ) ( #27807 )
...
* fix: using DN for transfer w/o internal customer (backport #27798 ) (#27805 )
* fix: using DN for transfer w/o internal customer (#27798 )
This used to be work before though not "advertised", since a lot of
users have started using it as feature, it can't be broken now.
(cherry picked from commit df1f8fddf6e2f4106c1a2778614ba9a1dc5ff67e)
* fix(ux): use toast instead of popup
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
(cherry picked from commit fa944382c53bdeeb92f2dcc876e2c11ed03e20cc)
# Conflicts:
# erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
* fix: resolve conflict
* fix: resolve conflicts
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-10-05 16:16:21 +05:30
Deepesh Garg
020f94532b
fix: COA Importer showing blank validations
...
(cherry picked from commit 0660d6ed01e0668ce828cf9bae9790aead874233)
2021-10-05 09:49:05 +00:00
Saqib
74c8e7bb97
Merge branch 'develop' into pay-received-amt-fix
2021-10-05 11:14:41 +05:30
Sagar Vora
09ccdee2db
feat: add total_billing_hours to Sales Invoice (fp #26783 ) ( #27742 )
...
* feat: add `total_billing_hours` to Sales Invoice
* fix: re-save doctypes
* fix: indentation
* fix: replace reference to old function
2021-10-04 16:41:24 +05:30
Rucha Mahabal
5905cf9002
refactor!: Removed healthcare module from ERPNext ( #27362 )
...
* chore: Removed healthcare module
* chore: Removed healthcare demo, patch files
* chore: Rename imports from erpnext to healthcare
* chore: Added healthcare deprecation warning patch
* chore: Removed healthcare module code in other modules
* chore: Code clean up
* refactor: Remove sales invoice custom js related to healthcare
* fix: sider
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-10-04 15:46:40 +05:30
Saqib
9051735529
perf: fetching of account balance in chart of accounts ( #27661 )
2021-10-04 11:44:46 +05:30
Saqib Ansari
1b7414e948
fix: cannot add deductions in internal transfer payment entry
2021-10-04 11:24:02 +05:30
Deepesh Garg
4abb43a425
Merge pull request #27749 from GangaManoj/fix-pe-payment-term
...
fix: Display appropriate message for Payment Term discrepancies in Payment Entry
2021-10-04 11:06:20 +05:30
ChillarAnand
a1d3a09d3c
Merge branch 'develop' into care
2021-10-04 09:46:34 +05:30
Deepesh Garg
f109f6fd16
fix: Linting issues
...
(cherry picked from commit ff570f48a0ba56925528eb8696b8b7d862252d8f)
2021-10-02 16:10:09 +00:00
Deepesh Garg
237b1a91de
fix: Remove unwanted comments
...
(cherry picked from commit e4b89d2fcd6c1eb788f94ad5f9563ccec07a0f2a)
2021-10-02 16:10:09 +00:00
Deepesh Garg
9244fe563a
fix: Chart Of Accounts import button not visible
...
(cherry picked from commit 3529622a0d28e9cdd6e602b5450ca79d13cfa0ed)
2021-10-02 16:10:08 +00:00
GangaManoj
9f14695743
fix: Display appropriate message if different Payment Terms are used in PE and its Payment References
2021-10-02 21:02:07 +05:30
HENRY Florian
0bc213ed17
Merge branch 'develop' into dev_fix_27359
2021-09-30 11:08:44 +02:00
Deepesh Garg
f1a669c2f7
fix: Test case
...
(cherry picked from commit 23863c7663a94e32e32812301a7efca79575c470)
2021-09-30 03:06:02 +00:00
Deepesh Garg
774cd68f4c
fix: Test Case
...
(cherry picked from commit 846d128c5d536b5003dc3055f3239e6f92a3146c)
2021-09-30 03:06:01 +00:00
Deepesh Garg
13d2e7b198
fix: Deferred revenue entries post account freezing
...
(cherry picked from commit e2eb72eb5ba1aaadddf8278dd77bfe75a178ef01)
2021-09-30 03:06:00 +00:00
Deepesh Garg
b39f8a6215
fix: Ignore user permission for Represents Company field in Sales and Purchase docs ( #27684 )
...
* fix: Ignore user permission for Represents Company field in Sales and Purchase docs
* fix: Ignore user permission for fiscal year company
2021-09-29 15:54:35 +05:30
Ganga Manoj
28bdd6d2e3
Merge branch 'develop' into fix-depr-after-sale
2021-09-27 22:18:04 +05:30
Deepesh Garg
cc5dd5c67d
feat: TDS deduction using journal entry and other fixes ( #27451 )
...
* fix: TDS deduction using journal entry
* fix: Multi category application against single supplier
* refactor: TDS payable monthly report
* fix: Server side handling for default tax withholding category
* fix: Supplier filter for Journal Entry
* refactor: TDS computation summary report
2021-09-27 21:43:20 +05:30
Saqib
b68ac24cd5
chore: add shipping address in eway bill test ( #27662 )
2021-09-27 15:03:58 +05:30
ChillarAnand
765a9bb731
refactor: Remove sales invoice custom js related to healthcare
2021-09-27 07:34:54 +05:30
Saqib
e8ff649298
Merge branch 'develop' into fix-32644
2021-09-26 17:07:46 +05:30
Saqib Ansari
e6b4d33f4b
chore: hide exchange gain loss if empty
2021-09-26 17:07:13 +05:30
Saqib Ansari
dd2d039ca8
chore: hide exchange gain loss if empty
2021-09-26 15:51:03 +05:30
GangaManoj
796ed947ce
fix: Reverse depreciation entry made on sale if asset that was set to be sold in the future gets returned
2021-09-25 19:11:29 +05:30
GangaManoj
b9fb59da58
fix: Reset depreciation schedule on returning asset
2021-09-25 19:04:16 +05:30
Sagar Vora
c8b9a55e96
feat: add Partly Paid status in Invoices ( #27625 )
2021-09-22 12:11:35 +05:30
GangaManoj
7ab3b9dd5a
fix: Add test for depreciation on sale of a depreciated Asset
2021-09-21 07:11:40 +05:30
Ganga Manoj
eb8122baba
Merge branch 'develop' into fix-depr-after-sale
2021-09-21 06:29:41 +05:30
GangaManoj
244d9dee04
fix: Correct expected_values
2021-09-21 06:06:21 +05:30
Anuja Pawar
190c2d84da
fix: reference row added in allocation table ( #27602 )
2021-09-20 21:32:38 +05:30
ChillarAnand
aa580769a6
chore: Code clean up
2021-09-20 15:27:43 +05:30
Deepesh Garg
f07ff92a35
fix: Improvements in COA Importer ( #27584 )
2021-09-20 11:12:39 +05:30
Subin Tom
d49346ac45
fix: Tax breakup based on items, missing GST fields ( #27524 )
...
* fix: Tax breakup based on items
* fix: added gst fields,warehouse validation to pos inv,patch
* fix: tax breakup test fix, eway bill hsn fix
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2021-09-17 10:39:03 +05:30
Deepesh Garg
c9c8957250
feat: Merge POS invoices based on customer group ( #27471 )
...
* feat: Merge POS invoices based on customer group
* fix: Linting Issues
* fix: fieldname
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2021-09-16 19:33:57 +05:30
Rucha Mahabal
866763c16a
fix(minor): Employee filter in Unpaid Expense Claims report ( #27530 )
2021-09-16 00:05:16 +05:30
Deepesh Garg
625626b973
fix: Values with same account and different account number in consolidated balance sheet report ( #27493 )
2021-09-15 10:10:54 +05:30
Anuja Pawar
a58e309297
fix: fix to fetch customers and billing email in PSOA ( #27363 )
2021-09-09 19:37:52 +05:30
Anupam Kumar
7edac5a5d7
fix: removing duplicate currency() from sales_invoice.js ( #27410 )
2021-09-09 19:17:01 +05:30
Deepesh Garg
9104796eb8
Merge pull request #27258 from deepeshgarg007/tds_validity
...
feat: Validity dates in Tax Withholding Rates
2021-09-09 12:17:36 +05:30
Anuja Pawar
3576668638
fix: added Show Remarks checkbox in AR & AP reports ( #27374 )
2021-09-09 11:57:29 +05:30
Deepesh Garg
e7e2ce1271
fix: Linting Issues
2021-09-09 11:36:57 +05:30
Deepesh Garg
c33bbd4f39
fix: Test Case
2021-09-09 11:13:29 +05:30
Saqib
9c27f9be1e
fix: document naming rule not working for subscription invoices ( #27386 )
2021-09-08 16:47:04 +05:30
Dany Robert
fa819f2fb0
fix: General Ledger translation issues ( #27298 )
...
* fix: remove translations from GL report options
Options need not be translated, their display label gets translated
client side.
* fix: make group by options translatable
* ci: semgrep rule for translated options in report
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-09-08 16:28:05 +05:30
Saqib
df3e4ce1c0
fix: scan barcode fields input length ( #27389 )
...
* fix: undo unintentional changes
* fix: scan barcode fields input length
2021-09-08 16:04:13 +05:30
Deepesh Garg
ee1486209d
Merge branch 'develop' of https://github.com/frappe/erpnext into tds_validity
2021-09-08 11:33:42 +05:30
rohitwaghchaure
058d98342a
fix: missed to add voucher_type, voucher_no to get GL Entries ( #27368 )
...
* fix: missed to add voucher_type, voucher_no to get gl entries
* test: get voucherwise details utilities
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-09-07 12:14:40 +05:30
Ahmad
b42d63e526
Merge remote-tracking branch 'refs/remotes/havenir/ksa-vat' into ksa-vat
2021-09-06 23:26:52 +05:00
Ahmad
cb0c2d1477
feat(Regional): KSA VAT Report
2021-09-06 23:25:20 +05:00
ChillarAnand
c8565c7090
chore: Removed healthcare module code in other modules
2021-09-06 20:47:27 +05:30
Florian HENRY
aa7ee3ca03
fix: link in dashboard missing on SI from DN
2021-09-06 11:40:44 +02:00
Deepesh Garg
51d9572fe7
fix: Hardcode fiscal year and posting date
2021-09-05 17:56:12 +05:30
Deepesh Garg
ceaa804f04
fix: Presentation currency conversion in reports ( #27316 )
2021-09-05 17:21:29 +05:30
Deepesh Garg
092d41ecda
fix: Debug CI
2021-09-03 20:04:18 +05:30
Deepesh Garg
41392acd18
Merge branch 'develop' of https://github.com/frappe/erpnext into tds_validity
2021-09-03 19:19:35 +05:30
Deepesh Garg
8f5a77446e
Merge pull request #27279 from deepeshgarg007/gstr_1_cdnr_unregistered_json_develop
...
feat: CDNR Unreg json generation
2021-09-03 13:55:00 +05:30
Subin Tom
798b464ee3
fix: braintree payment processed twice ( #27300 )
2021-09-03 12:30:57 +05:30
ChillarAnand
e913e277d9
chore: Rename imports from erpnext to healthcare
2021-09-02 19:47:39 +05:30
Deepesh Garg
e1fffdb262
fix: Linting issues
2021-09-02 19:10:49 +05:30
Deepesh Garg
c85242e03d
Merge branch 'develop' of https://github.com/frappe/erpnext into gstr_1_cdnr_unregistered_json_develop
2021-09-02 18:59:59 +05:30
Ankush Menat
eec40513be
fix: minor linting issues ( #27314 )
...
* fix: syntax error in gratuity
* fix: unpacking None into three variables
* fix: unexpected kwarg for delete_accounting_dimensions
2021-09-02 17:42:45 +05:30
Chillar Anand
915b34391c
chore: Clean up imports ( #27302 )
...
* chore: Added isort to pre-commit config
* chore: Sort imports with isort
* chore: Clean up imports with pycln
* chore: Sort imports with isort
* chore: Fix import issues
* chore: Clean up sider issues
* chore: Remove import errors from flake8 ignore list
* chore: Clean up lint issues
2021-09-02 16:44:59 +05:30
Saqib
a158b825fc
Merge pull request #27124 from GangaManoj/gross-profit-product-bundle
...
feat: Improve Product Bundle handling
2021-09-02 11:12:56 +05:30
Deepesh Garg
d5a736d11e
test: Update test case
2021-09-01 21:15:24 +05:30
Ankush Menat
b147b85e6a
chore: whitespace / eof fixes
2021-09-01 16:57:21 +05:30
Ankush Menat
e46567192a
fix: invalid escape sequences in regex
2021-09-01 16:57:17 +05:30
GangaManoj
bc79084dac
fix: Add Product Bundle field in Items table
2021-09-01 16:06:47 +05:30
Ankush Menat
7d9819f352
fix: remove duplicate imports
2021-09-01 15:33:35 +05:30
GangaManoj
4d8f833cc9
fix: Remove Add Row and Delete Row options for Packed Items table
2021-09-01 15:20:40 +05:30
Ankush Menat
2d62c500c4
fix: undefined variables
2021-09-01 15:05:00 +05:30
Ankush Menat
694ae81618
fix: remove bare excepts
2021-09-01 15:02:28 +05:30
Deepesh Garg
8b644d8889
fix: Report and JSON generation for Advances received
2021-09-01 10:28:15 +05:30
Deepesh Garg
b6d0b17ed6
fix: Linting and patch fixes
2021-09-01 10:11:18 +05:30
Deepesh Garg
d06221ad7a
fix: Advance TDS test case
2021-09-01 10:05:10 +05:30
Ganga Manoj
82118975e2
Merge branch 'develop' into gross-profit-product-bundle
2021-08-31 22:08:10 +05:30
Anuja Pawar
3e404f15ff
refactor: payment reconciliation tool ( #27128 )
2021-08-31 18:59:29 +05:30
Deepesh Garg
c37cec9b9d
fix(minor): Incorrect unallocated amount on type receive ( #27262 )
2021-08-31 18:50:23 +05:30
Deepesh Garg
5e10e10329
feat: Validity dates in Tax Withholding Rates
2021-08-31 18:23:28 +05:30
Anurag Mishra
ab47409e91
feat: Full and Final Settlement and Gratuity Fix ( #26364 )
...
* feat: Full and Final Settlement
* removed option to pay via salary slip
* feat: Create JV
* test:fnf
* fix: tracking asset movement
* fix: sider and test
* fix: changes Requested
* fix: changes requested
* fix: valication for Asset
* fix: add filter for reference document only if relevant field is present
* fix: doctype cleanup
- add more fields to the list view and standard filter
- set title field
- incorrect field labels
* feat: add list view settings for FNF
* fix: incorrect reference type set in Journal Entry
* fix: validation message
* chore: add Full and Final Statement link to Workspace
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-08-31 17:59:26 +05:30
Subin Tom
9cb642238f
fix: expense claim reimbursed amount update ( #27204 )
2021-08-30 13:17:22 +05:30
François de Ryckel
327071cb90
replace cur_frm with frm ( #27210 )
2021-08-28 14:55:11 +05:30
GangaManoj
e44567754d
fix: Display Packed/Bundle Items table only if it exists
2021-08-27 20:16:13 +05:30
Devin Slauenwhite
072151e16d
feat: Payment reconciliation on accounts module workspace ( #25925 )
...
* feat: add payment reconciliation to accounting workspace
* fix: update modified and duplicate the link
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-08-27 19:44:57 +05:30
Shadrak Gurupnor
7433757489
fix: patches were breaking during migration ( #27200 )
...
* fix: patches were breaking during migrating
* fix: patches were breaking during migration
2021-08-27 18:00:16 +05:30
Kamal Johnson
a285b5b78b
feat: Accounts, Selling & Assets Onboarding cleanup ( #27112 )
...
* refactor: company form fields arrangement
* refactor: accounts onboarding steps
* refactor: re-arrange fields & modify labels in company form
* feat: onbording steps for accounts module
* fix: updated onboarding steps for selling module
* fix: remove unwanted steps from accounts
* feat: add more onboarding steps
* feat: Refactor onboarding-module for accounting workspace
* feat: Add basic asset onboarding steps
* feat: Add basic asset item form tour
* feat: Add basic selling onboarding-steps
* feat: Add basic form tour for purchase recipt
* feat: Add basic form tour for existing asset
* feat: Adding asset category form tour
* feat: Add form tour for asset category
* feat: Refactor sales taxes and charges template form tour with new method
* refactor: Remove old form tour for accounts settings
* refactor: Change asset category form tour with new tour method
* refactor: Change asset item form tour with new tour method
* refactor: Change purchase receipt form tour with new tour method
* refactor: Change asset form tour with new tour method
* refactor: Remove old form tour for selling settings
* refactor: general fix/typo in onboarding steps
* Apply suggestions from code review
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
* refactor: Remove old form tour method for sales order.
* fix: removed duplicate section break
* fix: Removed duplicate fields
Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
Co-authored-by: Anuja <anuja.pawar20@gmail.com>
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-08-27 15:47:11 +05:30
Saqib
08188f2ac7
Merge branch 'develop' into gross-profit-product-bundle
2021-08-27 15:41:41 +05:30
Saqib
987746592c
fix: period closing voucher tests ( #27198 )
2021-08-27 15:41:26 +05:30
Saqib
8008598eb2
Merge branch 'develop' into gross-profit-product-bundle
2021-08-27 14:48:54 +05:30
Deepesh Garg
ae7ec8e44d
fix: Base amount in tax gl entry
2021-08-26 23:51:09 +05:30
Rohan
16eed07a0f
fix: use Stripe's Price API for plan-price information ( #26107 )
...
* fix: use Stripe's new Plan API for price information
* patch: use inbuilt function to rename field
* fix: patch call
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-08-26 21:47:00 +05:30
Lovin Maxwell
f91faac7cd
fix: Pricing Rule on Transaction Based on Coupon ( #26949 )
2021-08-26 20:54:02 +05:30
Ankush Menat
ae55eab599
chore: remove deprecated and empty QUnit tests ( #27179 )
...
* chore: remove deprecated and empty QUnit tests
* ci: fix UI test config
Testing library was added on Frappe, in order to reuse command testing
library has to be installed during setup process.
2021-08-26 20:43:06 +05:30
Deepesh Garg
4b1f165429
fix: Use reverse debit and credit to get net amount in GL Entries ( #27174 )
...
* fix: Use reverse debit and credit to get net amount in GL Entries
* fix: Remove unused import
2021-08-26 18:34:15 +05:30
marination
45edfd9d50
fix: Remove duplicate create_internal_customer util
...
- Introduced via https://github.com/frappe/erpnext/pull/27086
2021-08-26 15:53:52 +05:30
Marica
f4dc9ee2aa
fix: Don't create inward SLE against SI unless is internal customer enabled ( #27086 )
...
* fix: Dont create inward SLE against SI unless is internal customer enabled
- Check if is internal customer enabled apart from target warehouse
- Test to check if inward SLE is made if target warehouse is accidentally set but customer is not internal
* test: Use internal customer for delivery of bundle items to target warehouse
- created `create_internal_customer` util
- reused it in delivery note and sales invoice tests
- use internal customer for target warehouse test in delivery note
2021-08-26 13:12:51 +05:30
Deepesh Garg
e2af9d5761
Merge pull request #27039 from nextchamp-saqib/common-party-acc
...
feat: common party accounting
2021-08-26 12:58:59 +05:30
rohitwaghchaure
fe4540d74d
fix: allow to change rate manually in case of stand-alone credit note ( #27036 )
...
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2021-08-26 12:52:36 +05:30
Brian Pond
1a919773d7
fix: Customers 'primary_address' not updated automatically ( #26798 ) ( #26799 )
...
* Fix for Issue #26798
This PR is a fix for GitHub Issue 26798:
https://github.com/frappe/erpnext/issues/26798
TLDR: When an Address is updated, and that Address is a Customer's Primary Address, update the Read Only field `customer.primary_address`
* Update address.py
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2021-08-26 11:57:28 +05:30
Ahmad
9cc451fc7d
feat(Regional): KSA VAT Report
2021-08-26 07:35:59 +05:00
Saqib Ansari
be7a38b662
fix: cost center in test_sales_invoice_against_supplier
2021-08-25 21:35:32 +05:30
Ganga Manoj
842ceb1301
fix: cannot reconcile bank transactions against internal transfer payment entries ( #26932 )
...
* fix: Only set Clearance Date for Payment Entries of type Internal Transfer if both Transactions have been reconciled
* fix: Reset clearance_date for intra-company Payment Entries that have only been reconciled with one Bank Transaction
* fix: indentation and args
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-08-25 20:32:26 +05:30
Rohan
87308465d8
fix: create zero-dollar invoices fro trial subscriptions ( #26441 )
2021-08-25 20:11:05 +05:30
Saqib Ansari
a2f8d6c31a
fix: party link permissions
2021-08-25 20:10:19 +05:30
Saqib Ansari
c101b42d4a
feat: validate multiple links
2021-08-25 20:08:28 +05:30
Saqib Ansari
881301ca9b
Merge branch 'develop' of https://github.com/frappe/erpnext into common-party-acc
2021-08-25 20:02:27 +05:30
Frappe PR Bot
81b4590479
fix: TDS calculation on net total ( #27058 ) ( #27140 )
...
(cherry picked from commit 4eb7c2a011f3abbe547c2a32978e7af6e1fd6d33)
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2021-08-25 18:18:16 +05:30
Ankush Menat
8d116fb9ff
fix: remove VARCHARs from Sales Invoice ( #27136 )
...
Sales Invoice doctype is starting to hit row length limit as many
integrations add custom fields on this doctype. This is just a small
change to remove VARCHAR(140) fields and reduce row size wherever
possible.
2021-08-25 16:45:41 +05:30
Saqib
62114b226f
feat: unreconcile on cancellation of bank transaction ( #27109 )
2021-08-25 16:25:51 +05:30
GangaManoj
3135d6dc6a
fix: Get Bundle Items
2021-08-25 15:35:40 +05:30
GangaManoj
13ae10b3a2
fix: Remove comments
2021-08-25 15:20:27 +05:30
Afshan
8366b6322e
fix: validate party and party type only if both available ( #27002 )
...
* fix: validate party and party type only if both available
* fix: indentation
2021-08-25 11:57:24 +05:30
Saqib
1dadea38a5
fix: remove unexpected comma ( #27132 )
2021-08-25 11:05:51 +05:30
GangaManoj
bea0f7a202
fix: Get data when grouped by invoice and otherwise
2021-08-25 02:52:18 +05:30
GangaManoj
96909b6c3b
fix: Display only the Invoice rows in bold
2021-08-25 02:49:14 +05:30
GangaManoj
b02effbc47
fix: Indentation
2021-08-25 01:00:40 +05:30
Ganga Manoj
3e5bbc9aa6
Merge branch 'develop' into gross-profit-product-bundle
2021-08-25 00:55:47 +05:30
GangaManoj
5f8c2b0946
fix: Remove base_rate and buying_rate for Invoice rows
2021-08-25 00:33:55 +05:30
GangaManoj
2dbf8075eb
fix: Calculate total buying_amount for each invoice
2021-08-25 00:09:07 +05:30
GangaManoj
3edb1938a9
fix: Fetch bundle item details
2021-08-24 23:38:24 +05:30
GangaManoj
257215f479
fix: Fetch base_net_total for each Invoice
2021-08-24 23:32:19 +05:30
GangaManoj
1956f62ad8
fix: Remove qty from Sales Invoice rows
2021-08-24 23:30:50 +05:30
Subin Tom
fbc5977248
fix: Updated timestamp for pos invoice json ( #27110 )
...
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
2021-08-24 22:34:02 +05:30
Anupam Kumar
1d6ef4b0d3
fix: replacing $.each -> forEach in SI ( #26995 )
...
* fix: replacing $.each -> forEach in SI
* fix: removed console log
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-08-24 22:06:19 +05:30
Frappe PR Bot
512ddc589f
fix: timesheet amount issue ( #25993 ) ( #26889 )
...
* fix: timesheet amount issue
* fix: timesheet detail rate conversion
* fix: condition to check timesheet currency
* fix: removing console statement
(cherry picked from commit a6aa6cd7d6
2021-08-24 22:00:32 +05:30
Saqib
f1313302c9
fix: pos invoice test ( #27113 )
2021-08-24 19:45:21 +05:30
Afshan
ad06fb2179
fix: calculation of gross profit percentage in Gross Profit Report ( #27045 )
2021-08-24 17:35:01 +05:30
Saqib
1db812ab9f
Merge branch 'develop' into common-party-acc
2021-08-24 17:27:43 +05:30
Saqib
f47cbae5e0
feat: allow draft pos invoices even if no stock available ( #27078 )
2021-08-24 17:27:27 +05:30
Saqib
9198caa5e7
fix: incorrect gl entry on period closing involving finance books ( #26921 )
2021-08-24 17:26:23 +05:30
Subin Tom
d4d5a4221a
feat: coupon code discount in pos invoice ( #27004 )
2021-08-24 16:22:46 +05:30
Saqib
9e82c24b27
fix: pos closing entry cancellation test ( #27099 )
...
* fix: pos closing entry cancellation test
* fix: invalid imports
* fix: sider issue
2021-08-24 15:37:00 +05:30
Pruthvi Patel
332ac105b5
refactor: use read_only_depends_on instead of code ( #27008 )
2021-08-24 12:07:38 +05:30
GangaManoj
46650cce0d
fix: Calculate total buying_amount and gross profit for each invoice
2021-08-23 21:17:32 +05:30
Deepesh Garg
69973a65aa
Merge pull request #26900 from deepeshgarg007/payment_entry_validations_and_trigger_develop
...
fix: Multiple fixes in payment entry
2021-08-23 18:03:01 +05:30
Subin Tom
47b63a627d
fix: Eway bill test update to check ver 1.0.0421 ( #27083 )
2021-08-23 15:38:26 +05:30
Deepesh Garg
df185045a1
Merge branch 'develop' into payment_entry_validations_and_trigger_develop
2021-08-23 10:34:28 +05:30
Deepesh Garg
496bff5136
feat: Column for total amount due in Accounts Receivable/Payable Summary ( #27069 )
2021-08-22 18:10:51 +05:30
Deepesh Garg
57e326e7d0
fix: Consolidated balance sheet showing incorrect values ( #26975 )
2021-08-21 17:59:11 +05:30
Saqib
5395f56c88
Merge branch 'develop' into common-party-acc
2021-08-20 20:42:50 +05:30
GangaManoj
d1453c0cd0
fix: Remove Item Code and Item Name columns
2021-08-20 18:26:17 +05:30
GangaManoj
75d4fc99fc
fix: Display Items in the format Item Code: Item Name
2021-08-20 18:25:36 +05:30
Saqib
c335962827
refactor!: drop e-invoicing integration from erpnext ( #26940 )
2021-08-20 11:10:46 +05:30
Saqib
153fe1cdb4
refactor: scan barcode field scanning ( #26990 )
2021-08-20 11:09:51 +05:30
GangaManoj
b5fac83987
fix: Add items belonging to Product Bundles as children
2021-08-20 06:07:53 +05:30
GangaManoj
33f100d75d
fix: Set initial_depth to 3
2021-08-20 06:06:47 +05:30
GangaManoj
97a1d426a3
fix: Assign indent and parent_invoice
2021-08-20 03:54:19 +05:30
GangaManoj
779a1d68a5
fix: Make Invoice row bold
2021-08-20 02:38:34 +05:30
