CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-25 22:21:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
48,728 Commits 430 Branches 1,726 Tags
ceafa0ce282cc41cb00a9c8f302a87166ea03595
Commit Graph

48728 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ruthra kumar
e6abe1b77f Merge pull request #36206 from ruthra-kumar/test_cases_for_payment_term_overallocation 
test: overallocation validation in payment entry
 2023-07-22 10:41:01 +05:30
ruthra kumar
93246043ec chore(test): enable multi-currency party for testing 2023-07-22 10:01:59 +05:30
ruthra kumar
8f9ef4ef5b chore: validation on multi-currency tran on company curtency account 2023-07-22 09:20:55 +05:30
ruthra kumar
5b37919574 chore: use flt for currency 2023-07-22 09:20:55 +05:30
ruthra kumar
6b4a81ee48 chore: test more scenarios 2023-07-22 09:20:44 +05:30
DaizyModi
653117c2a9 test: fix test case for itemised tax breakup 2023-07-21 17:56:33 +05:30
DaizyModi
b84deec601 fix: Correct Tax Breakup for different tax rates for same hsn code 2023-07-21 17:43:27 +05:30
Ritvik Sardana
7069e2a5a0 fix: removed validate_item_code function in sales_invoice 2023-07-21 17:18:35 +05:30
Deepesh Garg
cc36af57bd Merge pull request #36229 from deepeshgarg007/naming_in_order 
fix: FY in naming series variable for orders
 2023-07-21 16:05:31 +05:30
Deepesh Garg
7a7d32db81 fix: FY in naming series variable for orders 2023-07-21 16:03:17 +05:30
Gursheen Anand
ec80dc6f09 fix: make column names more general 2023-07-21 15:55:31 +05:30
Gursheen Anand
1c5c310f5a fix: fetch acc dimension fieldname 2023-07-21 13:37:48 +05:30
Gursheen Anand
59a2a04fcc fix: check gl entry status using is_cancelled 2023-07-21 13:22:01 +05:30
Gursheen Anand
1c033ce635 chore: change column format for report 2023-07-21 11:00:19 +05:30
Gursheen Anand
33f8f7d7b3 fix: exclude cancelled gl entries for opening balance 2023-07-21 10:57:55 +05:30
marination
17ff395f9a fix: Reverse GL entries only for submitted Dunnings 2023-07-20 20:54:43 +05:30
Deepesh Garg
de189c5f18 Merge pull request #35950 from FHenry/dev_feat_adress_contact_report 
feat: add Lead to Address And Contact report
 2023-07-20 20:26:38 +05:30
marination
aeae8d646a fix: Patch dunnings made after accounts were frozen 
- Consider "Accounts Frozen Until" and Period Closing Voucher
 2023-07-20 19:55:57 +05:30
Deepesh Garg
76db0b63ba Merge pull request #36214 from deepeshgarg007/tb_cancelled_entries 
fix: Trial Balance report considering cancelled entries
 2023-07-20 18:48:03 +05:30
Gursheen Anand
5d7dd9b0ec fix: project route permissions for user 2023-07-20 18:20:53 +05:30
rohitwaghchaure
1084f0d97f Merge pull request #36209 from mohsinalimat/patch-2 
fix: Ambiguous column error while submitting stock entry
 2023-07-20 18:03:27 +05:30
rohitwaghchaure
9a9939cfb3 Merge pull request #36208 from rohitwaghchaure/fixed-filter-mandatory-for-batch-wise-balance-report 
fix: made item or warehouse filter mandatory
 2023-07-20 18:02:37 +05:30
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
Gursheen Anand
610ead22e8 fix: show only projects with access in customer portal 2023-07-20 13:08:26 +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
HarryPaulo
4b4d828260 fix: inserting of items with pricing rule with qty range 2023-07-19 13:02:55 -03:00
Gursheen Anand
3f5afb9cac fix: reset dimension defaults when company changedin test 2023-07-19 18:15:59 +05:30
Gursheen Anand
23e56d3ec1 fix: clear dimension defaults after test 2023-07-19 16:07:32 +05:30
Deepesh Garg
781e57f5bf Merge pull request #36189 from deepeshgarg007/default_dashboard_dates 
fix: Default fiscal year in accounting, buying and selling charts
 2023-07-19 13:28:04 +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
e19a6f5dcb fix: fetch acc dimensions correctly when fieldname is different from name 2023-07-19 12:26:57 +05:30
Ankush Menat
0218f11f47 ci: dont run tests on branch 
6dda420176
 2023-07-19 12:17:32 +05:30
Gursheen Anand
b3f6d991b5 fix: duplicate acc dimension in test 2023-07-19 12:02:26 +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 5985e02574)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-07-18 17:40:49 +05:30
Gursheen Anand
77deac4fb9 test: PI offsetting entry for accounting dimension 2023-07-18 15:51:01 +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
Gursheen Anand
3a3ffa2307 fix: divide offsetting amount only when account exists 2023-07-18 12:51:09 +05:30
Deepesh Garg
cfae52a40a fix: Opening balance in TB report (#36171) 2023-07-18 12:26:19 +05:30
Gursheen Anand
1e1e4b93c1 fix: divide offsetting amount for multiple dimensions 2023-07-18 12:12:24 +05:30
s-aga-r
9fb1533b8f fix(test): test_stock_reservation_against_sales_order (#36166) 2023-07-18 08:31:02 +05:30
rohitwaghchaure
55d5469740 Merge pull request #36168 from frappe/mergify/bp/develop/pr-36162 
fix: incorrect Reserved Qty for Production Plan in BIN for the multi-uom case (backport #36162)
 2023-07-17 22:44:02 +05:30