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

35165 Commits

Author SHA1 Message Date
Vishnu VS
bb13c236b9
Merge branch 'develop' into develop 2023-04-28 14:06:12 +05:30
ruthra kumar
b44331c981 refactor: checkbox in purchase invoice 2023-04-28 14:06:04 +05:30
s-aga-r
e6fc281acf feat: add field Packed Qty in Delivery Note Item and Packed Item 2023-04-28 13:20:47 +05:30
s-aga-r
75fe9dd3ea fix: don't map items twice 
* don't explicitly map Delivery Note Item custom fields to Packing Slip Item, get auto-mapped while mapping the doc.
* call Packing List `set_missing_values` after mapping the doc.
* refactor `get_recommended_case_no`, use `frappe.db.get_value` instead of `frappe.db.sql`.
 2023-04-28 10:53:17 +05:30
s-aga-r
ee9f97ca7c fix: remove duplicate items validation 2023-04-28 09:07:03 +05:30
Vishnu VS
489f853ee2
Merge branch 'develop' into develop 2023-04-27 21:17:47 +05:30
s-aga-r
b62bf78814 refactor: packing_slip.js 2023-04-27 19:43:37 +05:30
s-aga-r
380dd73065 fix: map Packed Items while creating Packing Slip 2023-04-27 18:37:32 +05:30
Nihantra Patel
72dd7884a8 fix: Hyperlink in Quality Inspection Summary 2023-04-27 17:04:39 +05:30
s-aga-r
eca77134ae feat: add field pi_detail in Packing Slip 2023-04-27 15:48:02 +05:30
Nihantra Patel
6dfca79af3 fix: Report link, option, and added a link for Sales Person in GP 2023-04-27 15:04:50 +05:30
Vishnu VS
06e458c745
Merge branch 'develop' into develop 2023-04-27 12:24:29 +05:30
rohitwaghchaure
01bfd2ab67
Merge pull request #35066 from rohitwaghchaure/fixed-delivered-qty-issue-while-making-mr 
fix: don't create material request from sales order against delivered items
 2023-04-27 09:05:36 +05:30
Rohit Waghchaure
1e2deee579 fix: don't create material request from sales order against the delivered items 2023-04-26 20:30:53 +05:30
Vishnu VS
f68eef833c
Update erpnext/manufacturing/doctype/job_card/job_card.py 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2023-04-26 20:25:43 +05:30
Vishnu VS
5c94f2cc52
Update erpnext/manufacturing/doctype/job_card/job_card.py 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2023-04-26 20:25:15 +05:30
Vishnu VS
25d0119b7e
Merge branch 'develop' into develop 2023-04-26 18:56:09 +05:30
HarryPaulo
3be1ab9b8d
fix: allow submit delivery note when the sales order was billed... (#34910) 2023-04-25 21:54:41 +05:30
Kitti U. @ Ecosoft
c36dc3dc57
fix: v14, Bank Reconcile Tools not cover case JV debit bank (#35000) 2023-04-25 21:34:28 +05:30
rohitwaghchaure
5e37308b5e
Merge pull request #35050 from Nandhinidevi123/workstation_filter 
add if condition for workstation filter
 2023-04-25 21:28:41 +05:30
rohitwaghchaure
b24704740b
Merge pull request #34918 from s-aga-r/FIX-ISS-22-23-06298 
perf: Journal Entries
 2023-04-25 21:27:52 +05:30
mergify[bot]
ab0f7794b7
fix: wrong qty of remaining work orders to be created when using "Create" > "Work Order" (#34726) 
fix: wrong qty of remaining work orders to be created when using "Create" > "Work Order" (#34726)

* fix: convert asynchronous field update to synchronous

* fix: wrong qty of remaining work orders to be created when using "Create" > "Work Order"

(cherry picked from commit 189b020d228bdb1c0c589697162cf91718b2fa27)

Co-authored-by: danjeremynavarro <46537526+danjeremynavarro@users.noreply.github.com>
 2023-04-25 21:08:50 +05:30
tundebabzy
3d90b970d1
fix: click handler should not attempt indexed access of empty array (#35013) 
fix: click handler should not attempt indexed access
of empty array
 2023-04-25 20:57:59 +05:30
Ernesto Ruiz
c4512d552e
chore: Add translate function to Depreciation Journal Entry Remark (#35022) 
chore: Add translate function to Depreciation Journal Entry Remark
 2023-04-25 20:56:53 +05:30
Deepesh Garg
f88431a79a
fix: Common party JV cost center (#35008) 2023-04-25 20:54:22 +05:30
Raffael Meyer
d6bc8bba8b
fix: per_billed condition for Payment Entry (#34969) 2023-04-25 20:51:11 +05:30
Nandhinidevi123
74fb2bec3a add if condition for workstation filter 2023-04-25 20:08:35 +05:30
Deepesh Garg
f7b50f2ade
fix: Unable to allocate advance against invoice (#35007) 2023-04-25 19:18:45 +05:30
Nabin Hait
72b5c1f70a
fix: Use set instead of db_set as it is called from validate (#34967) 2023-04-25 19:18:08 +05:30
Deepesh Garg
ecea9b44a3
fix: Payment entry with TDS in bank reco statement (#34961) 2023-04-25 19:17:13 +05:30
Solufy Solution
f1acc5fabb
fix: Bulk Payment Entry from PO/SO (#34942) 
Co-authored-by: Nihantra Patel <n.patel.serpentcs@gmail.com>
 2023-04-25 19:16:30 +05:30
HarryPaulo
22290c2694
fix: respect title_field from doctype to bulk transactions (#34928) 2023-04-25 19:13:53 +05:30
Deepesh Garg
b545e3def0
fix: Add company field to lower deduction certificate (#34914) 2023-04-25 19:07:45 +05:30
Ankush Menat
6de71eb158
fix: pass reference_doctype in link queries (#35038) 2023-04-25 18:33:31 +05:30
Anand Baburajan
e08d636bf7
fix: use filter_by_finance_book instead of only_depreciable_assets in fixed asset register (#35031) 
fix: use filter_by_finance_book instead of only_depreciable_assets
 2023-04-25 15:16:50 +05:30
Sagar Sharma
31cdfa395a
Merge branch 'develop' into FIX-ISS-22-23-06298 2023-04-25 13:57:34 +05:30
s-aga-r
e782a054c8 refactor: get_stock_value_on() to get stock value of multiple warehouses at once 2023-04-25 13:54:36 +05:30
Anand Baburajan
ca388ed9cd
fix: value of depreciable assets not updating after manual depr entry [develop] (#35020) 
* fix: value of depreciable assets not updating after manual depr entry

* chore: add asset depr schedule to jv's ignore_doctypes_on_cancel_all
 2023-04-25 12:45:05 +05:30
rohitwaghchaure
7a63fbef4f
Revert "fix: Incorrect difference value in Stock and Account Value Comparison…" 2023-04-25 12:01:26 +05:30
ruthra kumar
20226d0a47
Merge branch 'develop' into revert-33699-tds_report_percentage 2023-04-25 10:43:18 +05:30
ruthra kumar
cb7a99cbaa Revert "fix: Rate from LDC in TDS reports (#33699)" 
This reverts commit db9beb3cdd.
 2023-04-25 10:13:07 +05:30
Vishnu VS
cdb05cd310
Merge branch 'develop' into develop 2023-04-25 09:29:47 +05:30
Sagar Sharma
58dbf7fc24
Merge branch 'develop' into stock-reservation 2023-04-24 22:58:16 +05:30
s-aga-r
bf4a57a37c fix: miscellaneous 
fix: don't reserve stock in group warehouse
fix: partial reservation in multiple warehouses
feat: add prompt to select warehouse and qty for reservation in SO
 2023-04-24 22:19:09 +05:30
rohitwaghchaure
291845e461
Merge pull request #35015 from rohitwaghchaure/incorrect-or-cond-delivery-note-issue 
fix: incorrect OR condition causing timeout error (For more than 50 line items)
 2023-04-24 18:06:59 +05:30
rohitwaghchaure
5d8bf56cb9
Merge pull request #35012 from rohitwaghchaure/fixed-incorrect-bom-end-of-life 
fix: item not showing in the BOM
 2023-04-24 18:06:37 +05:30
Rohit Waghchaure
379b215aea fix: incorrect OR condition causing timeout error 2023-04-24 17:32:32 +05:30
Rohit Waghchaure
02c3b41dc2 fix: item not showing in the BOM 2023-04-24 14:50:27 +05:30
s-aga-r
388f85b109 refactor: Stock Reservation code in sales_order.js 2023-04-24 12:04:22 +05:30
s-aga-r
e517c06847 chore: add warehouse info in SRE msg 2023-04-23 15:45:58 +05:30
s-aga-r
0b5f03e88c Revert "fix: Reserve and Unreserve buttons visibility in SO" 
This reverts commit cdb3181691.
 2023-04-23 15:41:48 +05:30
Vishnu VS
dc0e64a72d
Merge branch 'frappe:develop' into develop 2023-04-22 23:15:42 +05:30
ruthra kumar
ed14d1ce44
feat: Reconcile Payments in background (#34596) 
* feat: auto reconcile in background

* chore: Option to enable auto reconciliation in settings

* refactor: validate if feature is enabled in settings

* refactor: check for running job while using reconciliation tool

* chore: using doc to get filter values

* chore: use frappe.db.get_value in validations

* chore: cleanup commented out code

* chore: replace get_list with get_all

* chore: use block scope variable

* chore: type information for functions

* refactor: flag to ignore job validation check

* refactor: update parent doc status if all reconciled

* chore: create test_records file

* test: create a bunch of vouchers for testing auto reconcile

* chore: renamed auto_reconcile to process_payment_reconciliation

* chore: another child doctype to hold payments

* chore: remove duplicate field

* chore: add fetched payments to log

* chore: Popup comment message update

* chore: replace get_all with get_value

* chore: replace label in settings page

* chore: remove unit test and records

* refactor: status in reconciliation log

* refactor: set status in log as well

* chore: fix field name

* chore: change triggered job name

* chore: use status field in list view of log

* chore: status while there are no allocations

* refactor: split trigger function into two

* chore: adding cancelled status

* refactor: function trigger queued docs

* chore: cron job scheduled

* chore: fixing accouts settings json file

* chore: typos and variable scope

* chore: use 'pluck' in db call

* chore: remove redundant whitelist decorator

* chore: use single DB call to fetch values

* chore: replace get_all with get_value

* refactor: use raw db calls to fetch reconciliation log records

Using get_doc on `Process Payment Reconciliation Log` is costly when
handling large volumes of invoices.

Use raw frappe.db.get_all to selectively pull status and reconciled count

* chore: update status on successful batch operation

* chore: make payment table readonly

* chore: ability to pause the background job

* chore: remove isolate_each_allocation

* chore: more description in progress bar

* refactor: partially working state

* refactor: update reconcile flag and setting hard limits for fetching

* chore: make allocation editable -- NEED TO REVERT

* chore: pause button

* refactor: skip setter function in Payment Entry for better performan

* refactor: split reconcile function and skip a setter function

1. Split reconcile function into 2
2. While reconciling against payment entry, skip a
set_missing_ref_details setter method

* chore: increase payment limit

* refactor: replace frappe.db.get_all with frappe.db.get_value

* chore: remove unwanted doctypes

* refactor: make allocation table readonly

* perf: update ref_details only for newly linked invoices

* chore: rename skip flag

* refactor(UI): receivable_payable field should auto populate

* refactor: no control statements in finally block

* chore: cleanup section and rename checkbox

* chore: update new fieldname in code

* chore: update error msg

* refactor: start and pause integrated into status

pause checkbox has been removed

* refactor: added cancelled status to the log doctype

1. Moved the status section to the bottom in parent doc
2. Using alerts to indicate Job trigger status
 2023-04-22 17:24:35 +05:30
Rohit Waghchaure
f2253dd645 fix: duplicate reposting entries of same voucher 2023-04-22 11:16:12 +05:30
s-aga-r
0cd10a50d2 Merge branch 'develop' into stock-reservation 2023-04-22 10:04:46 +05:30
s-aga-r
28d0629df1 chore: add depends_on condition for Reserve Stock field in SO 2023-04-22 10:01:00 +05:30
s-aga-r
cdb3181691 fix: Reserve and Unreserve buttons visibility in SO 2023-04-22 09:49:47 +05:30
s-aga-r
b70273b988 chore: remove Enable Stock Reservation field description 2023-04-22 08:49:31 +05:30
rohitwaghchaure
9fa72cb9d8
Merge pull request #34982 from rohitwaghchaure/fixed-added-validation-for-extra-job-card 
fix: added validation for extra job cards
 2023-04-21 18:50:39 +05:30
Ankush Menat
ac871797b2
fix: SLA permissions (#34981) 2023-04-21 18:05:29 +05:30
rohitwaghchaure
56d62cae7a
Merge pull request #34980 from rohitwaghchaure/fix-inter-transfer-validation 
fix: validation for internal transfer entry
 2023-04-21 17:45:54 +05:30
s-aga-r
7e8fd8f324 chore: update reserved stock SLE validation 2023-04-21 17:44:44 +05:30
Rohit Waghchaure
6a0b7c9e8c fix: added validation for extra job card 2023-04-21 17:34:22 +05:30
Rohit Waghchaure
19911b48fd fix: validation for internal transfer entry 2023-04-21 16:56:09 +05:30
s-aga-r
9a37ac6c25 refactor: sum up SLE value in query 2023-04-21 13:28:14 +05:30
HENRY Florian
af8da53cf4
fix: FEC report for France accountancy (#34781) 
* fix: FEC report for France Accountancy legal requirement

* fix: FEC report for France Accountancy legal requirement

* fix: change to query standard

* fix: change to query standard

* fix: columns to standard dict

* fix: columns to standard dict

* fix: columns to data

* refactor: french report FEC

* refactor: french report FEC (2)

---------

Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
 2023-04-21 13:26:32 +05:30
Deepesh Garg
a02705ded7
chore: Move source and campaign to more info section (#34946) 2023-04-21 13:25:32 +05:30
ruthra kumar
3ec1597860
Merge pull request #34940 from ruthra-kumar/broken_set_exchange_gain_loss_btn_in_payment_entry 
fix: broken 'set exchange gain/loss' btn in payment entry
 2023-04-21 09:47:53 +05:30
Hossein Yousefian
984eb2a0dd
Merge branch 'develop' into get_incoming_rate_v14_fix 2023-04-20 16:50:34 +03:30
rohitwaghchaure
f218df460f
Merge pull request #34958 from rohitwaghchaure/removed-depends-on-for-employee-detail 
fix: removed depends on for the Employee Detail section
 2023-04-20 18:03:46 +05:30
rohitwaghchaure
6259c81adc
Merge pull request #34960 from rohitwaghchaure/fixed-stock-entry-type 
fix: stock entry type issue
 2023-04-20 18:03:23 +05:30
Sagar Vora
776b56ccd1 fix: use functools.wraps to preserve doc signature 2023-04-20 05:17:30 -07:00
Sagar Vora
2fa641f86d fix: simplify erpnext.get_region 2023-04-20 05:17:30 -07:00
Sagar Vora
17ef3c964f fix: set frappe.flags.company to call regional code accurately 2023-04-20 05:17:30 -07:00
Rohit Waghchaure
c3b5dcb767 fix: stock entry type issue 2023-04-20 16:39:26 +05:30
Rohit Waghchaure
a90a5b4aa4 fix: removed depends on for the Employee Detail section 2023-04-20 16:01:05 +05:30
Sagar Sharma
81653e4762
Merge branch 'develop' into FIX-ISS-23-24-00209 2023-04-20 15:46:01 +05:30
s-aga-r
8108b2de0a fix: PermissionError in Work Order 2023-04-20 15:41:37 +05:30
Nihantra Patel
b572bef71d fix: process_loss_percentage in BOM 2023-04-20 14:32:32 +05:30
Deepesh Garg
ea6eeace80
fix: filtering via batch no(#34950) 
* fix: filtering via batch no
 2023-04-20 12:48:44 +05:30
Sagar Sharma
e1f5a5adea
Merge branch 'develop' into FIX-INTERNAL-PR-GL-ENTRIES 2023-04-20 11:00:22 +05:30
ruthra kumar
fc6486d87d
Merge pull request #34922 from ruthra-kumar/refactor_payment_entry_ref_details 
refactor: refactor set_missing_values and set_missing_ref_details in Payment Entry
 2023-04-20 10:59:50 +05:30
ruthra kumar
df0682fa8c fix: broken set exchagne gain/loss btn broken in payment entry 2023-04-20 10:39:15 +05:30
Sagar Sharma
66723dc5db
Merge branch 'develop' into FIX-INTERNAL-PR-GL-ENTRIES 2023-04-20 10:31:29 +05:30
s-aga-r
11c8503180 fix(test): test_backdated_stock_reco_cancellation_future_negative_stock 2023-04-20 09:59:11 +05:30
Rohit Waghchaure
fcfa8842a7 fix: limit stock reco issue 2023-04-20 09:48:15 +05:30
rohitwaghchaure
3df4edc5c5
Merge branch 'develop' into get_incoming_rate_v14_fix 2023-04-19 21:07:54 +05:30
rohitwaghchaure
dd238aa5b4
Merge pull request #34929 from rohitwaghchaure/fixed-stock-and-account-value-report 
fix: Incorrect difference value in Stock and Account Value Comparison…
 2023-04-19 21:07:25 +05:30
Rohit Waghchaure
a77182645f fix: Incorrect difference value in Stock and Account Value Comparison report 2023-04-19 20:35:14 +05:30
Sagar Sharma
45c27e4e3d
Merge branch 'develop' into FIX-ISS-23-24-00145 2023-04-19 19:22:42 +05:30
Sagar Sharma
6519514db4
Merge branch 'develop' into use-UnixTimestamp 2023-04-19 18:23:29 +05:30
Vishal Dhayagude
59f3fedbf7
fix: batch qty conversion factor issue fixed in pos transaction (#34917) 2023-04-19 15:57:28 +05:30
ruthra kumar
b7d6e30f63 refactor: update ref details for selected references 
set_missing_ref_details can update only for selected references
 2023-04-19 15:13:10 +05:30
s-aga-r
c86c543fbf test: add test case for internal PR GL Entries 2023-04-19 13:30:37 +05:30
Sagar Sharma
2c0e22c01d
Merge branch 'develop' into use-UnixTimestamp 2023-04-19 12:57:20 +05:30
s-aga-r
e43bc38e05 refactor: rewrite get_stock_value_on() queries in QB 2023-04-19 12:05:17 +05:30
ruthra kumar
11cb2db3fe refactor: move set_missing_ref_detials out of set_missing_values 2023-04-19 11:54:08 +05:30
ruthra kumar
eaa5f1fd9d
Merge pull request #34838 from ruthra-kumar/making_similar_ledger_entries_merging_optional 
refactor: toggle merging similar ledger entries in JE
 2023-04-19 09:48:44 +05:30
barredterra
98d51b6c7b fix: remove empty translations 2023-04-18 18:27:21 +02:00
barredterra
f0a3e61ee9 fix: remove excessive fourth column 2023-04-18 17:27:46 +02:00
s-aga-r
6fca9adcd4 fix: internal Purchase Receipt GL Entries 2023-04-18 18:38:28 +05:30
Hossein Yousefian
13d4f85923
get_incoming_rate_voucher_no_fix 2023-04-18 14:50:09 +03:30
Hossein Yousefian
bbd44e6e7e
Merge branch 'frappe:develop' into get_incoming_rate_zero_in_rate_fix 2023-04-18 14:47:19 +03:30
barredterra
debc013728 fix: remove excessive fourth column 2023-04-18 12:23:54 +02:00
s-aga-r
e91abbfbe3 fix: add item-code filter for SCR supplied-items batch-no 2023-04-18 13:03:47 +05:30
Sagar Sharma
d07d67a968
Merge branch 'develop' into use-UnixTimestamp 2023-04-18 12:56:25 +05:30
s-aga-r
91a398a191 fix: use CombineDatetime instead of Timestamp in QB queries 2023-04-18 12:55:16 +05:30
Sagar Sharma
a78b4bef0e
Merge branch 'develop' into FIX-ISS-23-24-00171 2023-04-18 11:44:03 +05:30
ruthra kumar
3f537d30bd chore(patch): by default ledger entries of JE's will not be merged 2023-04-18 10:55:49 +05:30
ruthra kumar
a3e3fe149d refactor: checkbox to toggle merging of JE account heads 2023-04-18 08:59:33 +05:30
Ankush Menat
e4f152a416 fix: whitelist doc method 
This should've been whitelisted, looks like it was missed out

closes https://github.com/frappe/erpnext/issues/34898
 2023-04-18 08:24:22 +05:30
barredterra
aba87db6be fix: translation files 
- remove leading "DocType: XXX"
- remove leading path and line number
- add trailing comma (three columns total)
 2023-04-17 22:28:53 +02:00
MohsinAli
dd93ea067e
fix: change discuss forum url (#34891) 
[skip ci]
 2023-04-17 17:00:52 +05:30
Deepesh Garg
534ea5ad21
fix: Add offers info to website item (#34873) 
* fix: Add offers info to website item

* Revert "fix: Add offers info to website item"

This reverts commit 88b598edb61f0ab97b751581cc2719964e169055.

* fix: Add offer properties to website item
 2023-04-17 16:35:22 +05:30
s-aga-r
a527221709 test: add test case for consumption of reserved stock 2023-04-17 15:33:55 +05:30
s-aga-r
2ed7d8a1fb fix: don't allow Stock Reconciliation for items having reserved stock 2023-04-17 15:33:55 +05:30
s-aga-r
dc9bb772cb refactor(test): use change_settings instead of update_stock_settings 2023-04-17 15:33:55 +05:30
s-aga-r
a87bb78d72 fix: don't allow to enable Stock Reservation and Negative Stock simultaneously 2023-04-17 15:33:55 +05:30
s-aga-r
73f16752a6 chore: conflicts 2023-04-17 15:33:55 +05:30
s-aga-r
866f98ac15 test: Stock Reservation for Serial and Batch Items 2023-04-17 15:33:46 +05:30
Rohit Waghchaure
6bccd8644e fix: stock reco test case 2023-04-17 14:22:35 +05:30
rohitwaghchaure
9fd8b8e53a
Merge pull request #34851 from rohitwaghchaure/fixed-too-many-writes-error-in-stock-reco 
fix: too many writes error while making backdated stock reconciliation
 2023-04-17 12:01:36 +05:30
rohitwaghchaure
9f399f8741
Merge pull request #34882 from rohitwaghchaure/filter-to-hide-disabled-warehouses 
fix: don't show disabled warehouses in the Warehouse Wise Stock Balance report
 2023-04-17 12:00:57 +05:30
Rohit Waghchaure
9ceb1f6bda fix: don't show disabled warehouses in the Warehouse Wise Stock Balance report 2023-04-17 11:05:32 +05:30
Rohit Waghchaure
d9dd64b4d2 fix: linters issues 2023-04-16 23:25:51 +05:30
Sagar Sharma
db7b78328b
Merge branch 'develop' into FIX-ISS-23-24-00171 2023-04-16 20:13:42 +05:30
Deepesh Garg
5c75894065
fix: Advance payment against payment terms (#34872) 2023-04-16 17:11:24 +05:30
Shariq Ansari
f27c921783
Merge pull request #34876 from shariquerik/selling-workspace-fix 2023-04-16 14:26:24 +05:30
rohitwaghchaure
634d526d15
Merge pull request #34852 from wojosc/patch-36 
fix allowing rename of Lead
 2023-04-16 14:18:49 +05:30
Shariq Ansari
5a4dd354c1 fix: selling workspace is not migrating properly 2023-04-16 13:10:42 +05:30
Hossein Yousefian
1d162ffb87
get_incoming_rate_zero_in_rate_fix 2023-04-16 11:03:16 +03:30
s-aga-r
c9418aab45 chore: add items field label 2023-04-14 16:57:14 +05:30
s-aga-r
fb3271c624 fix: unable to change company for manual Serial No entry 2023-04-14 15:59:35 +05:30
Devin Slauenwhite
51c4338661
fix(ux): don't throw error when company defaults aren't set (#34825) 
* fix(ux): don't throw error when company defaults aren't set; instead prompt account input.

* fix: translate label and title
 2023-04-14 15:20:51 +05:30
Rohit Waghchaure
7bfc8f1236 fix: too many writes error while making backdated stock reconciliation 2023-04-14 15:12:58 +05:30
Raffael Meyer
59f6b773cd
feat: add german sales tax template (#34823) 
Nullsteuersatz nach § 12 Abs. 3 UStG
 2023-04-14 13:14:00 +05:30
Wolfram Schmidt
9d1cae01bd
fix allowing rename of Lead 
This is needed to consolidate data like merging leads together when duplicated appear.
 2023-04-14 09:05:09 +02:00
Deepesh Garg
a7051cb9b5
fix: Don't use stale item details (#34847) 2023-04-14 09:59:42 +05:30
Deepesh Garg
66130493eb
fix: Remove unnecessary checkbox from Accounts doctype (#34821) 2023-04-14 09:47:15 +05:30
Vishnu VS
194ed1842f
fix: update workstation hour rate 2023-04-13 19:02:03 +05:30
s-aga-r
6c9e419fec fix: validation for Non-Stock item in Sales Order Reservation 2023-04-12 16:18:13 +05:30
s-aga-r
e65b6d47e4 fix: disable Stock Reservation by default 2023-04-12 15:12:56 +05:30
s-aga-r
f0acb2049b fix: don't allow to deliver/transfer reserved stock 2023-04-12 14:13:54 +05:30
s-aga-r
56097807b4 fix: Stock Reservation validation in Stock Settings 2023-04-12 13:58:11 +05:30
s-aga-r
e7491d117d test: add test case for Stock Reservation against SO 2023-04-11 17:25:13 +05:30
Rohit Waghchaure
6851b5ba97 fix: reposting record not created for backdated stock reco 2023-04-11 14:35:33 +05:30
s-aga-r
51946c5528 chore: linter 2023-04-11 12:46:59 +05:30
Anand Baburajan
c957a5cd2e
fix: provide filter by depreciable assets in fixed asset register (#34803) 2023-04-11 12:16:07 +05:30
s-aga-r
a14a6002e7 Merge branch 'develop' into stock-reservation 2023-04-11 10:00:39 +05:30
s-aga-r
efcb84cedf test: add test cases for SO 2023-04-11 09:11:51 +05:30
s-aga-r
bc3cb6bff6 fix: cancel SRE on SO cancel 2023-04-11 08:32:37 +05:30
s-aga-r
a918adaa33 test: add test cases for SRE 2023-04-11 08:29:59 +05:30
Raffael Meyer
934e1b4e6a
fix: add german translation of "Partly Paid" (#34776) 2023-04-09 19:04:57 +05:30
Deepesh Garg
6f6928fa7b
fix: Item tax validity comparison fixes (#34784) 
fix: Item tax validity comparsion fixes
 2023-04-09 09:38:13 +05:30
Sagar Sharma
299fb2619f
Merge branch 'develop' into refactor-batch 2023-04-08 11:15:08 +05:30
s-aga-r
4a9a5f03fc Merge branch 'develop' into refactor-batch 2023-04-08 11:06:27 +05:30
Sagar Sharma
ba553dba62
Merge pull request #34739 from resilient-tech/item-tax-override-remove 
chore!: remove override to set item tax based on HSN code
 2023-04-07 21:39:08 +05:30
Anand Baburajan
29e025c012
Merge pull request #34778 from AnandBaburajan/asset_value_adjust_get_depr_amt 
fix: improper usage of get_depreciation_amount in asset_value_adjustment
 2023-04-07 16:48:06 +05:30
Anand Baburajan
90dee8b663
Merge pull request #34735 from ihosseinu/asset_movement_translation_fix 
'Make Asset Movement' button translation fix in asset_list.js
 2023-04-07 15:30:26 +05:30
Anand Baburajan
edaa0bc3f7
Merge branch 'develop' into asset_value_adjust_get_depr_amt 2023-04-07 15:24:37 +05:30
anandbaburajan
984905109d fix: improper usage of get_depreciation_amount in asset_value_adjustment 2023-04-07 15:23:02 +05:30
Sagar Sharma
f7fb001126
Merge branch 'develop' into FIX-ISS-22-23-06306 2023-04-06 15:59:32 +05:30
s-aga-r
a575bd50ef test: add test cases for internal PR received qty 2023-04-06 15:26:19 +05:30
rohitwaghchaure
7d2d2dd0af
Merge pull request #34768 from rohitwaghchaure/fixed-ux-issue 
fix: UX for stock entry, bom and work order
 2023-04-06 14:16:20 +05:30
Sagar Sharma
cfd4da3e8a
Merge branch 'develop' into FIX-ISS-22-23-06397 2023-04-06 13:23:39 +05:30
s-aga-r
a55b818119 fix: Subcontracting Receipt incorrect status 2023-04-06 13:20:33 +05:30
Rohit Waghchaure
82a136f991 fix: UX for stock entry, bom and work order 2023-04-06 12:51:32 +05:30
Deepesh Garg
91a26608ee
fix: Unable to create payment request against purchase invoice (#34762) 2023-04-06 12:40:58 +05:30
s-aga-r
0d1df26b88 chore: add Delivery Note Item in Purchase Receipt Status Updater 2023-04-06 09:31:46 +05:30
s-aga-r
bc39dfab5d feat: add Received Qty field in Delivery Note Item 2023-04-06 09:29:44 +05:30
rohitwaghchaure
8503d581a5
Merge pull request #34743 from rohitwaghchaure/fix-incorrect-balance-qty 
fix: incorrect stock balance quantity for batch item
 2023-04-05 23:21:44 +05:30
s-aga-r
ac24d778e8 refactor: add Docstrings for functions 2023-04-05 19:48:15 +05:30
Lucky-Tsuma
9bf87d708e
fix: payment entry is already created on posawesome. (#34712) 2023-04-05 13:52:00 +05:30
Deepesh Garg
56f5078357
fix: Shop by category fixes (#34688) 
* fix: Shop by category fixes

* chore: Update tests
 2023-04-05 12:43:32 +05:30
Ritwik Puri
f193393f57
fix!: require sender and message for contact us page (#34707) 
* fix: require sender and message for contact us page

* refactor: dont override frappe.send_message from client side

used override_whitelisted_method hook for the same
 2023-04-05 12:04:36 +05:30
Deepesh Garg
fd3fb64aa3
feat: Auto allocate advance payments only against orders (#34727) 
feat: Auto allocate advance payments only againt orders
 2023-04-05 12:02:44 +05:30
Anand Baburajan
869289a6e4
Merge pull request #34745 from frappe/mergify/bp/develop/pr-34737 
fix: don't include cancelled JVs in assdeprledger report (backport #34737)
 2023-04-05 11:59:52 +05:30
Raffael Meyer
e6a9b6ee95
feat: remove deprecated get_customer_list (#34624) 
feat: remove deprecated method

get_customer_list
 2023-04-05 11:56:15 +05:30
Anand Baburajan
5cc3c08059
fix: asset monthly WDV and DD schedule and refactor [develop] (#34646) 
* fix: monthly wdv and dd schedule

* chore: minor rename

* chore: fix tests
 2023-04-05 11:46:31 +05:30
anandbaburajan
1101b7bfdf fix: don't include cancelled JVs in assdeprledger report 
(cherry picked from commit 3896d41e95a2054b4ec76c5f5b2819b3f28ef98e)
 2023-04-05 06:04:43 +00:00
Rohit Waghchaure
ef4bd77196 fix: incorrect stock balance quantity for batch item 2023-04-05 00:02:45 +05:30
Sagar Vora
9c66ebb108 chore!: remove override to set item tax based on HSN code 2023-04-04 18:02:55 +05:30
Hossein Yousefian
b70615ef18
'Make Asset Movement' button translation fix 2023-04-04 14:49:43 +03:30
rohitwaghchaure
12325cb685
Merge pull request #31271 from dj12djdjs/fix-reserve-qty 
fix(stock): don't reserve qty on sales return.
 2023-04-04 06:21:30 +05:30
rohitwaghchaure
682730a498
Merge pull request #34715 from rohitwaghchaure/fixed-bom-update-log 
fix: bom update log not working for large batch size
 2023-04-03 15:49:25 +05:30
Rohit Waghchaure
d56070301c fix: bom update log not working for large batch size 2023-04-03 14:47:58 +05:30
Sagar Sharma
4571bd58d2
Merge branch 'develop' into FIX-ISS-22-23-06369 2023-04-03 14:26:09 +05:30
s-aga-r
6ec7590c21 fix: consider qty field precision 2023-04-03 14:08:11 +05:30
ruthra kumar
1eefd517d1
Merge pull request #34694 from ruthra-kumar/recalculate_difference_on_allocation_change 
fix(ui): recalculate difference amount on allocation change
 2023-04-03 10:03:01 +05:30
s-aga-r
38e9367184 fix: re-reserve stock on SO Update Items 2023-04-02 21:24:59 +05:30
s-aga-r
d5f0a7fcbb refactor(minor): stock reservation entry 2023-04-02 19:23:22 +05:30
Deepesh Garg
4c61ee30bb
fix: Multiple issues in purchase invoice submission (#34600) 
* fix: Multiple issues in purchase invoice submission

* fix: Base grand total calculation

* chore: Calculate base grand total separately only in multi currency docs

* fix: Add gl entry for round off
 2023-04-02 09:35:27 +05:30
Kitti U. @ Ecosoft
74b29eb5e2
fix: Bank clearance for case loan (disburstment/repayment) (#34586) 2023-04-01 18:50:30 +05:30
Deepesh Garg
1e3eb4deed
Merge pull request #34287 from frappe/early-payment-loss 
fix: Allocate tax loss to tax account head on early payment discount
 2023-04-01 18:49:02 +05:30
s-aga-r
8f3d5d24e1 chore: notify user on Reservation and Unreservation of Stock 2023-04-01 16:21:50 +05:30
s-aga-r
ee322c4904 fix(ux): Allow Partial Reservation depends on Enable Stock Reservation 2023-04-01 15:55:10 +05:30
ruthra kumar
32a4ca6b6c fix: recalculate difference amount on allocation change 2023-04-01 09:17:33 +05:30
s-aga-r
ef34f703d4 fix(ux): don't show Stock Reservation btn if Stock Reservation is disabled 2023-03-31 22:08:12 +05:30
s-aga-r
632f27b10d fix(ux): Reserve Stock and Reserved Stock Qty in SO Item 2023-03-31 21:58:21 +05:30
s-aga-r
de1492759d feat: add option to reserve stock in SO 2023-03-31 21:42:13 +05:30
s-aga-r
0ae400c986 feat: add option to unreserve stock in SO 2023-03-31 15:38:16 +05:30
Sagar Sharma
2c2b5a5b6e
Merge branch 'develop' into FIX-33830 2023-03-31 14:14:17 +05:30
ruthra kumar
770640f4e1
Merge pull request #34679 from ruthra-kumar/fix_credit_note_with_positive_total 
fix: enclose ternary operator in parentheses
 2023-03-31 13:31:16 +05:30
s-aga-r
26569b2162 fix: Stock Reservation validation for SO 2023-03-31 13:12:19 +05:30
s-aga-r
81fe5cfd72 chore: update Reserve Stock label to Reserve Stock on Submit in SO 2023-03-31 13:06:30 +05:30
s-aga-r
4d8ae41553 chore: make Reserve Stock on Sales Order Submission disabled by default 2023-03-31 12:50:13 +05:30
Sagar Sharma
b4ace345f9
Merge branch 'develop' into FIX-33830 2023-03-31 12:35:45 +05:30
Sagar Sharma
d0d3961a1e
Merge branch 'develop' into FIX-34240 2023-03-31 12:34:27 +05:30
s-aga-r
06d1bc4d12 Revert "chore: add SRE ref in DN dashboard" 
This reverts commit 15cb99290c.
 2023-03-31 12:20:52 +05:30
s-aga-r
2d3997b2d7 refactor: remove Against Stock Reservation Entry field from DN Item 2023-03-31 12:16:59 +05:30
ruthra kumar
986daa6578 fix: enclose ternary operator in parentheses 2023-03-31 12:09:57 +05:30
Deepesh Garg
576575c227
fix: Column value mismatch in COA blank template (#34658) 2023-03-31 11:10:50 +05:30
s-aga-r
706be2a415 chore: make Production Plan Item Reference table hidden in Production Plan 2023-03-31 10:32:49 +05:30
Deepesh Garg
7c42b72ee7
fix: Total debit and credit while importing via Data Import (#34659) 2023-03-30 17:28:19 +05:30
rohitwaghchaure
edb0666b2c
Merge branch 'develop' into fix-reserve-qty 2023-03-30 17:26:32 +05:30
rohitwaghchaure
c4a0842a4f
Merge pull request #34636 from rohitwaghchaure/posting-time-issue 
fix: posting time issue
 2023-03-30 17:25:47 +05:30
rohitwaghchaure
06eac67796
Merge pull request #34664 from rohitwaghchaure/fixed-incorrect-balance-qty-stock-ledger 
fix: incorrect balance qty in the stock ledger report
 2023-03-30 17:25:35 +05:30
Richard Case
ddb17a8880
fix: plaid log_error syntax issue (#34642) 2023-03-30 16:45:56 +05:30
s-aga-r
1a84a0c411 fix: DN Item group warehouse validation against SRE 2023-03-30 16:42:27 +05:30
Anand Baburajan
d999dea3e4
chore: improve asset depr posting failure msg (#34661) 
* chore: improve asset depr posting error msg

* chore: add period

* chore: improve msg
 2023-03-30 16:38:37 +05:30
Rohit Waghchaure
345e6facbe fix: posting time issue 2023-03-30 16:34:34 +05:30
s-aga-r
e286d05904 fix: SRE Available Qty to Reserve for Group Warehouse 2023-03-30 16:26:42 +05:30
Rohit Waghchaure
cbdaab940d fix: incorrect balance qty in the stock ledger report 2023-03-30 16:20:42 +05:30
anandbaburajan
af3e807607 chore: auto fill asset name and available for use date 2023-03-30 15:28:59 +05:30
Sagar Sharma
b6c0a675f9
Merge branch 'develop' into FIX-33830 2023-03-30 13:49:41 +05:30
s-aga-r
a4112c75c5 fix: BOM Update Cost, when no actual qty 2023-03-30 13:46:50 +05:30
rohitwaghchaure
448afa2b7c
Merge pull request #34648 from rohitwaghchaure/fixed-serial-no-qty-issue-in-stock-reco 
fix: serial no with zero quantity issue in stock reco
 2023-03-30 13:04:48 +05:30
Anand Baburajan
33ff1b5a72
Merge branch 'develop' into asset_value_adjustment_asset_name 2023-03-30 12:53:06 +05:30
anandbaburajan
2b0470d1f5 fix: incorrect arg name in asset value adjustment 2023-03-30 12:50:33 +05:30
Rohit Waghchaure
17131e5a02 fix: serial no with zero quantity issue in stock reco 2023-03-30 11:47:32 +05:30
Komal-Saraf0609
ad11934d39
fix: enabling lead even after "Opportunity" created against it (#34627) 
* fix: enabling lead even after "Opportunity" created against it

* chore: Linting Issues

---------

Co-authored-by: Komal Saraf <komal@frappe.io>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-03-30 08:03:55 +05:30
s-aga-r
72e32f1ae4 refactor: remove Posting Date and Posting Time columns from SRE 2023-03-29 18:42:44 +05:30
s-aga-r
2522198129 Revert "chore: add fields Serial No and Batch No in SRE" 
This reverts commit 48108b5b41.
 2023-03-29 18:33:03 +05:30
s-aga-r
6b24551672 Revert "chore: add Stock Reservation Qty column in Stock Projected Qty Report" 
This reverts commit 3d75e3f434.
 2023-03-29 18:33:03 +05:30
s-aga-r
3fcaa21110 refactor(minor): stock_reservation_entry.py 2023-03-29 18:33:01 +05:30
Bevan Tony Medrano
ddc3050e99 Asset maintenance task add dropdown "3 Yearly" (#34607) 
* feat(asset_maintenance.json):Add 3 yearly in periodicity dropdown

* add server side implications for 3 yearly

(cherry picked from commit 625b8e800537cceabffda50a0bbed1effc2e2aa5)
 2023-03-29 12:16:03 +00:00
Raffael Meyer
f5453adf4d
fix: switch to supported update_linked_doctypes (#34625) 2023-03-29 16:59:10 +05:30
Komal-Saraf0609
d0660ad222
fix: lost opportunity report issue (#34626) 
* fix: lost opportunity report issue

* chore: Linting Issues

---------

Co-authored-by: Komal Saraf <komal@frappe.io>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-03-29 16:51:18 +05:30
s-aga-r
517b5f8567 refactor: rewrite batch.py queries in QB 2023-03-29 14:02:09 +05:30
Sagar Sharma
867d898304
fix: zero rm-cost for batch rm item in SCR (#34616) 
fix: `0` rm-cost for batch rm item in SCR
 2023-03-28 18:45:16 +05:30
rohitwaghchaure
738dd57904
Merge pull request #34461 from s-aga-r/FIX-ISS-22-23-05936 
fix: incorrect `Opening Value` in `Stock Balance` report
 2023-03-28 17:40:25 +05:30
akiratfli
07c9b99072
fix: bad strings format for update-translations (#34592) 
Co-authored-by: justin.li <justin.li@lungteh.com>
 2023-03-28 17:20:54 +05:30
ruthra kumar
7c13533f30
Merge pull request #34608 from ruthra-kumar/reconciliation_debit_credit_mismatch 
chore: removing redundant validation
 2023-03-28 16:54:37 +05:30
Vishal Dhayagude
7aafc90d58
fix: Tax Category not able to set hence it calculating zero tax for item whoes tax template set (#34525) 
* fix: Tax Category not able to set hence it calculating zero tax for item whoes tax template set

* fix: minor change added
 2023-03-28 16:48:03 +05:30
Devin Slauenwhite
393bc25e2d
fix: don't get zero value entries for exchange rate calculation (#34475) 
* fix: multiply None by float

* chore: remove debug
 2023-03-28 16:34:24 +05:30
Deepesh Garg
50c1172f29
fix: Party Name in SOA print when viewed from Customer/Supplier master (#34597) 
fix: Party Name in SOA print when viewd from Customer/Supplier master
 2023-03-28 15:36:16 +05:30
Deepesh Garg
12ad2aa2e5
fix: Percentage billing in Sales Order (#34606) 2023-03-28 15:33:59 +05:30
Marica
dae40dfbb4
Merge branch 'develop' into early-payment-loss 2023-03-28 15:01:28 +05:30
ruthra kumar
d52f7e2820 fix: removing redundant validation 2023-03-28 13:44:23 +05:30
s-aga-r
7d0bc0914d Merge branch 'develop' into stock-reservation 2023-03-28 12:25:17 +05:30