Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
45,935 Commits 3 Branches 0 Tags 1 GiB
49981fecc7
Commit Graph

35809 Commits

Author SHA1 Message Date
Deepesh Garg
fd58bbff6b fix: Trial Balance report considering cancelled entries 2023-07-20 17:51:54 +05:30
MohsinAli
c21fd45883
fix: Ambiguous column error while submitting stock entry 
Stock Entry Type=Manufacture

request.js:457 Traceback (most recent call last):
  File "apps/frappe/frappe/app.py", line 94, in application
    response = frappe.api.handle()
  File "apps/frappe/frappe/api.py", line 54, in handle
    return frappe.handler.handle()
  File "apps/frappe/frappe/handler.py", line 47, in handle
    data = execute_cmd(cmd)
  File "apps/frappe/frappe/handler.py", line 85, in execute_cmd
    return frappe.call(method, **frappe.form_dict)
  File "apps/frappe/frappe/__init__.py", line 1610, in call
    return fn(*args, **newargs)
  File "apps/frappe/frappe/desk/form/save.py", line 28, in savedocs
    doc.save()
  File "apps/frappe/frappe/model/document.py", line 305, in save
    return self._save(*args, **kwargs)
  File "apps/frappe/frappe/model/document.py", line 327, in _save
    return self.insert()
  File "apps/frappe/frappe/model/document.py", line 259, in insert
    self.run_before_save_methods()
  File "apps/frappe/frappe/model/document.py", line 1045, in run_before_save_methods
    self.run_method("validate")
  File "apps/frappe/frappe/model/document.py", line 914, in run_method
    out = Document.hook(fn)(self, *args, **kwargs)
  File "apps/frappe/frappe/model/document.py", line 1264, in composer
    return composed(self, method, *args, **kwargs)
  File "apps/frappe/frappe/model/document.py", line 1246, in runner
    add_to_return_value(self, fn(self, *args, **kwargs))
  File "apps/frappe/frappe/model/document.py", line 911, in fn
    return method_object(*args, **kwargs)
  File "apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py", line 122, in validate
    self.validate_qty()
  File "apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py", line 433, in validate_qty
    transferred_materials = frappe.db.sql(
  File "apps/frappe/frappe/database/database.py", line 220, in sql
    self._cursor.execute(query, values)
  File "env/lib/python3.10/site-packages/pymysql/cursors.py", line 158, in execute
    result = self._query(query)
  File "env/lib/python3.10/site-packages/pymysql/cursors.py", line 325, in _query
    conn.query(q)
  File "env/lib/python3.10/site-packages/pymysql/connections.py", line 549, in query
    self._affected_rows = self._read_query_result(unbuffered=unbuffered)
  File "env/lib/python3.10/site-packages/pymysql/connections.py", line 779, in _read_query_result
    result.read()
  File "env/lib/python3.10/site-packages/pymysql/connections.py", line 1157, in read
    first_packet = self.connection._read_packet()
  File "env/lib/python3.10/site-packages/pymysql/connections.py", line 729, in _read_packet
    packet.raise_for_error()
  File "env/lib/python3.10/site-packages/pymysql/protocol.py", line 221, in raise_for_error
    err.raise_mysql_exception(self._data)
  File "env/lib/python3.10/site-packages/pymysql/err.py", line 143, in raise_mysql_exception
    raise errorclass(errno, errval)
pymysql.err.OperationalError: (1052, "Column 'qty' in field list is ambiguous")
 2023-07-20 13:51:17 +05:30
Rohit Waghchaure
16498627ce fix: made item or warehouse filter mandatory 2023-07-20 13:00:05 +05:30
Deepesh Garg
3bc79eebe3
Merge pull request #35689 from marination/payments-based-dunning 
feat: Payments based dunning
 2023-07-20 12:06:36 +05:30
ruthra kumar
e7e3853f81 test: overallocation validation in payment entry 2023-07-20 09:08:55 +05:30
Deepesh Garg
3759a41b83 fix: Default fiscal year in accounting, buying and sellingcharts 2023-07-19 13:17:12 +05:30
Gursheen Anand
2f7b112736 fix: filter by party in opening row calculation 2023-07-19 12:36:44 +05:30
Gursheen Anand
dd37f6cbd6 fix: show tax withholding category details for customers 2023-07-19 11:51:45 +05:30
ruthra kumar
bccfd22fc0
Merge pull request #36181 from ruthra-kumar/fix_broken_overallocation_validation_on_multi_term_payment_against_invoice 
fix: broken overallocation validation in payment entry
 2023-07-19 10:46:41 +05:30
ruthra kumar
ee83f94bb0 refactor: payment term outstanding in party account currency 2023-07-19 10:06:49 +05:30
ruthra kumar
f8d4b19cb9 fix: broken overallocation validation in payment entry 
In a multi term payment schedule, overallocation logic broke. Fixing
it using individual term outstanding amount in references. this should
work for the simple, one term payment schedule as well
 2023-07-18 21:04:13 +05:30
mergify[bot]
b4db5e9561
fix: validate docs in closed accounting period on save (#36157) 
fix: validate docs in closed accounting period on save (#36157)

(cherry picked from commit 5985e02574e387ef92a2bf0a9d2d1b49ad57cdd3)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-07-18 17:40:49 +05:30
Deepesh Garg
fbea61bbc6
fix: Trailing opening entries in Accounts closing balance (#36175) 2023-07-18 15:16:52 +05:30
Ankush Menat
07d2b896c1 fix: log error during exotel migration 2023-07-18 13:01:33 +05:30
Deepesh Garg
cfae52a40a
fix: Opening balance in TB report (#36171) 2023-07-18 12:26:19 +05:30
s-aga-r
9fb1533b8f
fix(test): test_stock_reservation_against_sales_order (#36166) 2023-07-18 08:31:02 +05:30
Deepesh Garg
9e791efc82 refactor: client side accounts controller 2023-07-17 21:44:43 +05:30
Deepesh Garg
43e65d91ea chore: Remove unused files 2023-07-17 21:26:40 +05:30
Rohit Waghchaure
7af3c3d0b6 fix: incorrect Reserved Qty for Production Plan in BIN for multi-uom case 
(cherry picked from commit 2f632d031aa53e1e03763623449e7cde7dca3c55)
 2023-07-17 15:11:13 +00:00
Sagar Vora
bccb718cc2 chore: use consistent quotes 2023-07-17 15:45:36 +05:30
Marica
1c1e7380e3
Merge branch 'develop' into payments-based-dunning 2023-07-17 12:33:19 +05:30
Deepesh Garg
ef19634a13 chore: fix build 2023-07-17 12:25:56 +05:30
Anand Baburajan
305c37917f
chore: add validation for account type of party type and account (#36141) 
chore: add validation to check if account type of party type and account match
 2023-07-17 11:00:19 +05:30
Kitti U. @ Ecosoft
2607847061
refactor: Leave Application should not be in hook.py (#36008) 2023-07-17 10:14:37 +05:30
rohitwaghchaure
a0742c52bb
Merge pull request #36151 from rohitwaghchaure/table-for-serial-and-batch 
fix: Added report 'Serial and Batch Summary' to view serial / batch nos
 2023-07-16 19:50:15 +05:30
Florian HENRY
e48dc0808d Merge branch 'develop' of https://github.com/frappe/erpnext into dev_feat_adress_contact_report 2023-07-16 11:28:59 +02:00
Rohit Waghchaure
708eefb383 fix: Added report 'Serial and Batch Summary' to view serial / batch nos 2023-07-16 13:28:08 +05:30
Deepesh Garg
6270607c6d
fix: Remove current fiscal year from Global Defaults (#35960) 
* fix: Remove current fiscal year from Global Defaults

* fix: Remove button to set default

* fix: Add utils to get fiscal year

* fix: Incorrect import

* feat: Add hook for naming series parser
 2023-07-16 12:58:42 +05:30
Ankush Menat
bd9ef74ef7 perf: send SLA doctypes in boot 
This request is fired on every load, data rarely if ever changes though.
 2023-07-16 11:38:54 +05:30
Deepesh Garg
f0d4c4c180 Merge branch 'develop' of https://github.com/frappe/erpnext into eslint 2023-07-15 20:29:14 +05:30
Deepesh Garg
a6ce20a0fc chore: Remove domain related files 2023-07-15 19:40:53 +05:30
Deepesh Garg
3fa2a8c2d8 chore: fix linting issues 2023-07-15 18:03:16 +05:30
s-aga-r
6daaf42b38
Merge pull request #36133 from s-aga-r/FIX-ISS-23-24-02011 
perf: index in `Item` and `Item Variant Attribute`
 2023-07-15 10:09:27 +05:30
Deepesh Garg
924cdef6d9 ci: add eslint and update linting confs 2023-07-14 18:53:02 +05:30
Deepesh Garg
297c7e833c
fix: Opening entries showing up incorrectly in TB report (#36135) 
* fix: Opening entries showing up incorrectly in TB report

* chore: Linting Issue
 2023-07-14 18:39:37 +05:30
Ankush Menat
6b0b6404fc
Merge pull request #36131 from surajshetty3416/move-exotel-to-separate-app 
refactor!: Remove exotel
 2023-07-14 18:23:00 +05:30
s-aga-r
8f5b94f5fd
fix: TypeError while creating WO from PP (#36136) 2023-07-14 18:01:11 +05:30
Rucha Mahabal
692bfccb6e
Merge pull request #36116 from barredterra/local-holidays 2023-07-14 17:46:18 +05:30
Ankush Menat
41b6b739c0 fix: touch modified to migrate 2023-07-14 17:39:25 +05:30
Ankush Menat
d95559a53c fix: patch for exotel 2023-07-14 17:39:22 +05:30
s-aga-r
04400eb2e4 perf: index disabled in Item 2023-07-14 17:18:55 +05:30
s-aga-r
e4128a5c91 perf: index variant_of and attribute in Item Variant Attribute 2023-07-14 17:17:24 +05:30
Gursheen Anand
a93d7633d4 test: purchase register and ledger view 2023-07-14 17:16:39 +05:30
barredterra
dab9688410 refactor(Holiday List): use autocomplete fieldtype 2023-07-14 13:33:55 +02:00
Gursheen Anand
b8a83f57b7 chore: fix typo 2023-07-14 16:25:58 +05:30
Suraj Shetty
23bc87f2aa Merge branch 'develop' of https://github.com/frappe/erpnext into move-exotel-to-separate-app 2023-07-14 16:21:48 +05:30
barredterra
8aff5a1dab fix(Holiday List): allow empty value 2023-07-14 12:33:27 +02:00
Deepesh Garg
ac9ad8ec36
fix: Handle multi-company in patch (#36127) 
fix: Handle multi-compnay in patch
 2023-07-14 15:56:59 +05:30
barredterra
8271a39cdb fix(Holiday List): use current user's language 
For consistency with "weekly off" descriptions
 2023-07-14 12:16:49 +02:00
barredterra
509061f05b fix: German translations of Holiday List 2023-07-14 12:14:01 +02:00
barredterra
4888d75e72 feat(Holiday List): display localized country name 2023-07-14 11:59:45 +02:00
Gursheen Anand
0d89bfacdb fix: show additional table cols from india compliance api call 2023-07-14 13:03:22 +05:30
Kitti U. @ Ecosoft
3b884efca9
fix: get_dimension with_cost_center_and_project=false is not working. (#35974) 
* fix: get_dimension with_cost_center_and_project=false is not working.

with_cost_center_and_project is no python str, and it always evaluated as True, despite JS call it with false

* chore: Linting Issues

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-07-14 13:03:00 +05:30
Raffael Meyer
d5fe1432f8
fix: improve "Update Items" modal (#36105) 
* fix: make "Update Items" modal larger

* fix: remove conversion factor from overview

Conversion factor doesn't make much sense without two different UOMs
next to it, hence moving it to row detail view
 2023-07-14 12:27:35 +05:30
Gursheen Anand
c084fe6b3f refactor: filter accounting dimensions using qb 2023-07-14 11:05:50 +05:30
Gursheen Anand
944244ceff fix: modify rows and columns for ledger view 2023-07-14 10:50:12 +05:30
Deepesh Garg
b4bd978791
fix: Account balance patch and query fixes (#36117) 2023-07-14 10:28:36 +05:30
barredterra
fd23bd0434 test(Holiday List): weekly off and local holidays 2023-07-13 14:13:33 +02:00
barredterra
aa18b25a71 feat: add local holidays 2023-07-13 13:29:07 +02:00
Deepesh Garg
d631c7dffa
fix: Accounts closing balance patch (#36113) 2023-07-13 16:10:05 +05:30
ruthra kumar
72f577aad2 fix: incorrect idx on JE's after reconciliation 2023-07-13 15:12:58 +05:30
s-aga-r
5f307f92e0
refactor: Batch Item Expiry Status report (#36106) 2023-07-13 05:44:58 +05:30
Gursheen Anand
21c993a7b3 fix: clear accounting dimension value when based on field changes 2023-07-12 20:32:08 +05:30
Gursheen Anand
c973e3c746 chore: remove debugging print statements 2023-07-12 17:40:27 +05:30
Gursheen Anand
bf08aa7529 fix: filtering through accounting dimensions 2023-07-12 17:17:58 +05:30
Gursheen Anand
f5027fdcaf refactor: move fn to fetch advance taxes to utils & use qb 2023-07-12 16:42:58 +05:30
Gursheen Kaur Anand
596a14e34f
feat: add project filter in reports importing financial statements js file (#36097) 
feat: add project filter in financial statements js file
 2023-07-12 15:49:17 +05:30
Gursheen Anand
6c11ca1b75 refactor: use qb to fetch PE JV and Inv 2023-07-12 14:43:18 +05:30
Gursheen Anand
1e8b8b5b29 fix: linting issues 2023-07-12 11:14:03 +05:30
Gursheen Kaur Anand
1094319e3e
Merge branch 'develop' into purchase-sales-register-with-PE/JE 2023-07-12 11:00:35 +05:30
Deepesh Garg
0a6c565eb3
fix: Ambiguous column error while submitting stock entry 
fix: Ambiguous column error while submitting stock entry
 2023-07-12 10:18:38 +05:30
Gursheen Anand
dd8c3d5462 feat: filter based on accounting dimension in profitability analysis 2023-07-12 10:00:18 +05:30
mergify[bot]
8580287092
fix: allow manual asset receipt mov from nowhere (backport #36093) (#36094) 
fix: allow manual asset receipt mov from nowhere (#36093)

(cherry picked from commit 4aaa1a15d7dfe9ad81d3cc1f000dac3e324cfa6f)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-07-12 08:26:49 +05:30
HarryPaulo
2268f7db43 fix: paid_amount when the group is mode of payment 2023-07-11 11:35:37 -03:00
rohitwaghchaure
59e54eabef
Merge pull request #36088 from rohitwaghchaure/fixed-reposting-circulr-dependecy 
fix: circular dependency during reposting causing timeout error
 2023-07-11 18:28:39 +05:30
Ankush Menat
7e4b6683e6 fix: Dont bold URL parts 
closes https://github.com/frappe/frappe/issues/21445
 2023-07-11 18:19:50 +05:30
Rohit Waghchaure
c16a5814d4 fix: circular dependency during reposting causing timeout error 2023-07-11 17:51:44 +05:30
s-aga-r
be5881280f
fix: incorrect status in MR created from PP (#36085) 2023-07-11 17:09:23 +05:30
Gursheen Anand
7650b0073a fix: validate party filter for fetching payments 2023-07-11 15:18:28 +05:30
Gursheen Anand
d5aa0e325e feat: fetch JV with PE 2023-07-11 14:47:23 +05:30
Deepesh Garg
ce9164ec69
fix: Validate for missing expense account (#36078) 
* fix: Validate for missing expense account

* fix: Validate for missing expense account
 2023-07-11 12:03:38 +05:30
ruthra kumar
e44615f52b
Merge pull request #36076 from ruthra-kumar/possible_type_error_on_err_creation 
fix: possible type error on ERR creation
 2023-07-11 10:37:37 +05:30
ruthra kumar
176966daab fix: possible type error on ERR creation 2023-07-11 10:04:17 +05:30
Raffael Meyer
bf84e0d441
refactor: remove frappe.dynamic_link (#35096) 2023-07-10 21:22:06 +05:30
mergify[bot]
872a23c77d
fix: also check on_hold (#35910) 
fix: also check on_hold (#35910)

(cherry picked from commit 5aa02b8571efdc1710a9b3069a18a80ed17856a2)

Co-authored-by: RJPvT <48353029+RJPvT@users.noreply.github.com>
 2023-07-10 20:34:54 +05:30
Dany Robert
361a357088
fix: payment entry voucher_type error (#35779) 
* fix: payment entry `voucher_type` error

* chore: linters
 2023-07-10 19:32:59 +05:30
Gursheen Anand
9c87997dae fix: fetch cost center for PE 2023-07-10 19:12:19 +05:30
Gursheen Anand
cbef6c30c3 refactor: move repeating code to common controller 2023-07-10 18:39:35 +05:30
Gursheen Anand
d7ffad1dd3 feat: fetch PE along with SI 2023-07-10 18:07:55 +05:30
Wolfram Schmidt
49c61e7ebb
fix: Add company filter in list view (#36047) 
fix: Add company filter in list view
 2023-07-10 18:03:50 +05:30
rohitwaghchaure
06dcc4ed96
Merge pull request #36063 from rohitwaghchaure/fixed-valuation-for-dn-return 
fix: Delivery Note return valuation
 2023-07-10 17:48:41 +05:30
Rohit Waghchaure
6a10ae662c fix: Delivery Note return valuation 2023-07-10 17:06:02 +05:30
Dany Robert
5c820ecc20
fix: precision causing outstanding issue on partly paid invoices (#36030) 
* fix: precision causing outstanding issue on partly paid invoices

* chore: linters
 2023-07-10 16:20:45 +05:30
Gursheen Anand
44493707e2 refactor: use single qb query for PE and PI 2023-07-10 14:37:33 +05:30
mergify[bot]
b3a99e38cc
chore: add asset depr posting error in error log (backport #36052) (#36055) 
chore: add asset depr posting error in error log (#36052)

(cherry picked from commit 0f9a6ee70acc88a1190fc66fb95a3bd5d6dea02f)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-07-10 14:31:19 +05:30
MohsinAli
2816076789
1052, "Column 'qty' in field list is ambiguous in work_order.py 2023-07-10 14:09:41 +05:30
rohitwaghchaure
22eee472dd
Merge pull request #36001 from rohitwaghchaure/fixed-added-validation-for-rejected-warerhouse 
fix: accepted warehouse and rejected warehouse can't be same
 2023-07-10 13:55:20 +05:30
Gursheen Anand
4f0aa54c09 feat: add check for fetching PE along with Invoice details in Purchase Register 2023-07-10 13:38:30 +05:30
rohitwaghchaure
b16f364866
Merge pull request #36054 from rohitwaghchaure/fixed-incorrect-stock-levels 
fix: incorrect stock levels in the Batch
 2023-07-10 13:35:59 +05:30
Rohit Waghchaure
d618aaef32 fix: accepted warehouse and rejected warehouse can't be same 2023-07-10 13:19:17 +05:30
Rohit Waghchaure
aeaf8fd89c fix: incorrect stock levels in the Batch 2023-07-10 13:03:10 +05:30
ruthra kumar
3ef034dda8
Merge pull request #36051 from ruthra-kumar/auto_exchange_rate_revaluation_creation 
feat: Provision to auto create Exchange Rate Revaluation
 2023-07-10 12:59:23 +05:30
aioaccount
46fe9ac5cd
fix: labels and translations (#35963) 
fix: labels and translations
* fix: Vietnamese translation of customer
* fix: Vietnamese translation of bill
 2023-07-09 20:41:52 +05:30
Gursheen Kaur Anand
674af15696
fix: deferred accounting entries on accounts frozen (#35978) 
* fix: accounts frozen entries in deferred accounting

* test: accounts frozen date in deferred accounting

* fix: reset account settings after running test

* fix: resolve conflicts

* fix: modify expected gle when deferred accounting is disabled through JE

* fix: change posting date when accounts not frozen
 2023-07-09 20:41:12 +05:30
Raffael Meyer
af28f95c60
refactor(Payment Entry): translatable strings (#36017) 
* refactor(Payment Entry): translatable strings

* fix: German translations
 2023-07-09 20:19:53 +05:30
aioaccount
ef7fd7548c
fix: Vietnamese translation of "Company" (#35887) 
fix: Vietnamese translation of "Company"
 2023-07-09 20:17:35 +05:30
Deepesh Garg
4d07e20b05
fix: Opening balance in presentation currency in Trial Balance report (#36036) 2023-07-09 20:16:12 +05:30
Raffael Meyer
353d765140
fix: German translations (#35990) 
* fix: add missing German translation

* fix: wrong German translation
 2023-07-09 14:14:34 +05:30
Navin Balaji
828e647019
fix: bank reconciliation tool variable issue (#36022) 
fix: bank reconciliation tool variable issue (#36022)
 2023-07-09 14:13:48 +05:30
ruthra kumar
4f51c5a433 refactor: submit and make JV through background job 2023-07-07 05:49:53 +05:30
Raffael Meyer
4badac8e9e
fix(Payment Entry): compare rounded amount (#36011) 2023-07-05 21:35:41 +05:30
mergify[bot]
98281341b9
fix: handle loan_repayment's posting_date datetime in bank_clearance_summary report (backport #36004) (#36005) 
* fix: handle loan_repayment's posting_date datetime in bank_clearance_summary report (#36004)

(cherry picked from commit 937e1fb0245af291789ccd88f168d0402d9a00d8)

# Conflicts:
#	erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py

* chore: resolving conflicts

---------

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-07-04 22:46:00 +05:30
Deepesh Garg
0a17c78a36
fix: Share ledger showing cancelled docs (#35993) 2023-07-04 17:49:07 +05:30
Sagar Vora
30e4052a76
feat(accounts): standardize additional columns implementation for sales/purchase reports (#36000) 2023-07-04 17:41:30 +05:30
Deepesh Garg
2f169575e9
fix: Netherlands - Grootboekschema COA structure (#35991) 
fix: Netherlands - Grootboekschema coa structure
 2023-07-04 15:30:27 +05:30
Ankush Menat
a449a4be29
chore: Add frappe school links (#35995) 
Frappe School provides plenty of free tutorial for learning ERPNext.
 2023-07-04 14:58:45 +05:30
barredterra
a939431d48 fix: german translations 2023-07-03 21:03:24 +02:00
barredterra
e686bb0739 Merge remote-tracking branch 'upstream/develop' into payments-based-dunning 2023-07-03 19:56:42 +02:00
rohitwaghchaure
8179d6a30d
Merge pull request #35977 from rohitwaghchaure/reserve-pos-invoice-batches 
fix: reserve the pos invoice batches
 2023-07-03 22:33:45 +05:30
Rohit Waghchaure
1e8f6c0840 fix: reserve the pos invoice batches 2023-07-03 17:38:48 +05:30
ruthra kumar
6644311c8b refactor: checkbox for enabling auto ERR creation 2023-07-03 14:31:13 +05:30
Anand Baburajan
dedb5e23f7
fix: delete loan module workspace properly after separation (#35971) 
* fix: delete loan module workspace properly after separation

* chore: run remove_loan_management_module patch again
 2023-07-03 13:06:46 +05:30
Deepesh Garg
5448859254
fix: Update no copy for received_qty field (#35965) 2023-07-03 13:03:52 +05:30
Vishnu VS
e05b33a6c2
feat: add method for ordered quantity in supplier scorecard (#35930) 
fix: add method for getting ordered quantity in the supplier scorecard variable.

Co-authored-by: vishnu <vishnuviswambara2002@gmail.com>
 2023-07-03 09:23:27 +05:30
rohitwaghchaure
232dfad13a
fix: conflicts 2023-07-02 10:45:12 +05:30
Rohit Waghchaure
b77a808921 fix: reposting has not changed valuation rate 
(cherry picked from commit c0c693d8b0faf42089314cf43f4fc117f45de4b4)

# Conflicts:
#	erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
 2023-07-02 05:13:29 +00:00
Deepesh Garg
3df0c5e32f
Merge pull request #35609 from GursheenK/#34282-Record-advance-payment-as-a-liability 
feat: Record Advance Payment as a liability
 2023-07-01 17:49:49 +05:30
Deepesh Garg
d54f52474a
fix: Expense Account filter in Sales Invoice (#35944) 2023-06-30 20:02:46 +05:30
Deepesh Garg
be5cb1aa17
Merge pull request #35943 from GursheenK/company-specific-proj-filtering 
fix: project filtering based on company in P&L Report
 2023-06-30 20:01:24 +05:30
Deepesh Garg
fda2d2bd59 Merge branch 'develop' of https://github.com/frappe/erpnext into #34282-Record-advance-payment-as-a-liability 2023-06-30 19:35:34 +05:30
Deepesh Garg
80e6c90740 chore: precision in test 2023-06-30 19:35:22 +05:30
Florian HENRY
da72bd9819 feat: add Lead to Adresse And contact report 2023-06-30 15:11:45 +02:00
Deepesh Garg
7e7737d692 test: Update test account 2023-06-30 18:37:52 +05:30
Deepesh Garg
0a49213338 test: Update test records 2023-06-30 17:32:42 +05:30
Marica
0a67a3a9c4
Merge branch 'develop' into payments-based-dunning 2023-06-30 13:32:50 +05:30
Deepesh Garg
bbb6ebb84e fix: Outstanding amount validation 2023-06-30 13:25:22 +05:30
Gursheen Anand
84d4888f5f fix: make company field mandatory in project doctype 2023-06-30 12:54:45 +05:30
Gursheen Anand
ce252a0d45 fix: show projects with no company value set 2023-06-30 12:42:19 +05:30
s-aga-r
90a77030a7 fix: add filter for disabled batch 2023-06-30 12:34:39 +05:30
Gursheen Anand
904ca746a6 fix: project filtering in P&L Report 2023-06-30 12:11:23 +05:30
Anand Baburajan
988d755906
refactor!: removing loan management module (#35522) 
* chore: resolving conflicts

* refactor: bank_clearance and add hook for get_payment_entries_for_bank_clearance

* refactor: bank_reconciliation_tool and add hook for get_matching_vouchers_for_bank_reconciliation

* fix: remove sales invoice from bank_reconciliation_doctypes and use hook for voucher clearance

* refactor: remove loan tests from test_bank_transaction

* refactor: bank_clearance_summary and add hook for get_entries_for_bank_clearance_summary

* refactor: removed test_bank_reconciliation_statement

* refactor: bank_reconciliation_statement and add hook for get_amounts_not_reflected_in_system_for_bank_reconciliation_statement

* refactor: add missing hook and patches for module removal and deprecation warning

* refactor: remove loan management translations

* chore: add erpnext tests dependent on lending
 2023-06-30 11:02:49 +05:30
rohitwaghchaure
9f1cf0bbb0
Merge pull request #35921 from rohitwaghchaure/fixed-seperate-table-for-schedule 
refactor: separate table added to track scheduling in the job card.
 2023-06-29 22:24:47 +05:30
s-aga-r
fe4161e4d7
Merge pull request #35935 from s-aga-r/FIX-35898 
feat: allow the partial return of components against SCO
 2023-06-29 21:20:59 +05:30
Rohit Waghchaure
497c83eb7e refactor: separate table added to track scheduling in the job card 2023-06-29 20:51:44 +05:30
s-aga-r
2a60884abc fix: reduce return qty while calculating transferred qty 2023-06-29 18:59:18 +05:30
s-aga-r
2f6d56dd62 fix: don't update SCO status to closed until full return 2023-06-29 18:44:40 +05:30
Deepesh Garg
0408b6d655 Merge branch 'develop' of https://github.com/frappe/erpnext into #34282-Record-advance-payment-as-a-liability 2023-06-29 12:19:42 +05:30
Deepesh Garg
1e078d03bb fix: Partial PLE cancellation 2023-06-29 12:18:25 +05:30
RJPvT
1d1103f39c
chore: update translations 
chore: update translations
 2023-06-29 11:02:08 +05:30
Deepesh Garg
06821f9781
Merge pull request #35904 from GursheenK/voucher-wise-balance-report 
feat: add voucher-wise balance report for unequal dr/cr GL entries
 2023-06-29 09:07:45 +05:30