Commit Graph

4968 Commits

Author SHA1 Message Date
Deepesh Garg
ebdf1959fd
Merge pull request #36254 from deepeshgarg007/remove_auto_repeat
fix: Remove auto repeat (subscription) button from Sales and Purchase documents
2023-07-27 21:18:03 +05:30
Rohit Waghchaure
55a9537220 fix: added missing option Partially Received in the status dropdown field
(cherry picked from commit 4fa93b05c62b7f340a94e9e84d9d2e132ea35b99)
2023-07-25 12:39:07 +00:00
Deepesh Garg
3f81e15672
Merge pull request #36147 from deepeshgarg007/eslint
refactor(ci): add eslint and update linting confs
2023-07-24 20:55:07 +05:30
rohitwaghchaure
7f4dda1b06
Merge pull request #36259 from rohitwaghchaure/fixed-report-default-email-outgoing-error
fix: no default email account causing reposting issue
2023-07-24 15:03:09 +05:30
Rohit Waghchaure
efb51526a9 fix: no default email account causing reposting issue 2023-07-24 14:00:20 +05:30
Deepesh Garg
4bb6db86f8 fix: Remove auto repeat (subscription) button from Sales and Purchase documents 2023-07-24 12:29:57 +05:30
Deepesh Garg
8d3d9493f0 chore: linting issues 2023-07-23 20:06:41 +05:30
Deepesh Garg
8ccb8e3c5b chore: Move buying controller to utils 2023-07-23 18:50:44 +05:30
Deepesh Garg
7205fb9b97 chore: convert sales common to utils 2023-07-23 12:07:21 +05:30
Deepesh Garg
4077254b01 chore: resolve undefined variables issue 2023-07-22 23:07:18 +05:30
Deepesh Garg
0b1e78e127 chore: Add landed cost taxes and charges common in bundles 2023-07-22 21:19:48 +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
Deepesh Garg
9e791efc82 refactor: client side accounts controller 2023-07-17 21:44:43 +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
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
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
f0d4c4c180 Merge branch 'develop' of https://github.com/frappe/erpnext into eslint 2023-07-15 20:29:14 +05:30
Deepesh Garg
3fa2a8c2d8 chore: fix linting issues 2023-07-15 18:03:16 +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
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
Raffael Meyer
bf84e0d441
refactor: remove frappe.dynamic_link (#35096) 2023-07-10 21:22:06 +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
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
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
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
Deepesh Garg
5448859254
fix: Update no copy for received_qty field (#35965) 2023-07-03 13:03:52 +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
s-aga-r
90a77030a7 fix: add filter for disabled batch 2023-06-30 12:34:39 +05:30
Gursheen Kaur Anand
b9e9204e52
fix: create multiple variants button count and status (#35915)
fix: change class for fetching columns in multiple variants
2023-06-28 15:39:00 +05:30
HLD
af418d2342
fix: filter parent warehouses not showing (#35897) 2023-06-27 13:17:52 +05:30
David Arnold
742df8a25e
fix: delivery trip driver is only required on submit (#35876)
This allows drafting trips and stops without yet deciding on the
assignable driver which, in real life, may well be decided on after
preparing and planning the trip.
2023-06-27 11:36:44 +05:30
Devin Slauenwhite
f9ed8c10ab
fix: make reorder_level not required (#35831)
* fix: make reorder_level not required

* fix: allow material request to be made if projected_qty <= reorder_level
2023-06-24 16:03:15 +05:30
Marica
2868baebab
fix: Payment Term must be mandatory if Allocate Payment based on .. is checked (#35798)
- Front and Back end validation of condition
- Fix test to accomodate fix
2023-06-23 16:00:20 +05:30
Deepesh Garg
b523c779f5 Merge branch 'develop' of https://github.com/frappe/erpnext into ledger_preview 2023-06-22 15:43:43 +05:30
Deepesh Garg
0e68da5a2a feat: Show stock ledger preview 2023-06-22 15:43:32 +05:30
rohitwaghchaure
d1bccc8c65
Merge pull request #35829 from rohitwaghchaure/refactor-returned-from-rejected-warehouse
fix: return against rejected warehouse (UX Issue)
2023-06-22 12:03:38 +05:30
Rohit Waghchaure
756dbe7ce8 refactor: return against rejected warehouse 2023-06-21 17:40:48 +05:30
rohitwaghchaure
edc38edabf
Merge pull request #35611 from rohitwaghchaure/fix-dont-allow-to-create-reposting-entry-for-closing-stock-balance
fix: don't allow to make reposting entry for closing stock balance period
2023-06-21 14:15:40 +05:30
Rohit Waghchaure
96c5c7b1df fix: don't allow to make reposting entry for closing stock balance period 2023-06-21 11:55:51 +05:30
s-aga-r
4f941ac5c0 perf: index purpose in Stock Entry 2023-06-19 18:42:25 +05:30
Türker Tunalı
507c966aa7
chore: Make material request title translatable (#35764)
chore: Make material request title translatable
2023-06-18 22:29:42 +05:30
Sagar Sharma
b5c1c725be
Merge pull request #35739 from s-aga-r/FIX-35493
fix(ux): set route options for new `SBB`
2023-06-18 15:13:15 +05:30
rohitwaghchaure
c51e6dba8d
Merge pull request #35756 from rohitwaghchaure/fixed-stock-entry-not-able-to-save
fix: validation of job card in stock entry
2023-06-17 13:32:20 +05:30