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

45013 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rohitwaghchaure
a10aab35ff
Merge pull request #35118 from rohitwaghchaure/fixed-don-not-allow-to-repost-valuation 
fix: don't allow to make reposting for the closed period
 2023-05-01 20:41:14 +05:30
mergify[bot]
49674585a5
fix: handle expected_value_after_useful_life properly in asset value adjustment (backport #35117) (#35119) 
fix: handle expected_value_after_useful_life properly in asset value adjustment (#35117)

(cherry picked from commit 80230fec3ef079b75825447a61836f8a9ce64f57)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-05-01 19:59:58 +05:30
Rohit Waghchaure
f751727149 fix: don't allow to make reposting for the closed period 2023-05-01 18:48:29 +05:30
ruthra kumar
ce4e18c8d2 test: Sales/Purchase Orders will not book Exchange gain/loss 2023-05-01 14:09:19 +05:30
ruthra kumar
effb34bbfa refactor: don't book exch gain/loss for sales/purchase orders 2023-05-01 14:08:30 +05:30
Deepesh Garg
ea0b03ae9e
fix: Updates in process statement of Accounts (#35064) 2023-05-01 13:09:47 +05:30
Deepesh Garg
64be694087
fix: Patch for posting closing balances (#35037) 2023-05-01 10:56:46 +05:30
Deepesh Garg
f3b3dabb9a
fix: Naming series error in Journal Entry template (#35084) 2023-05-01 10:50:51 +05:30
ruthra kumar
123355392b fix: incorrect paid_amount and exchange rate in PE 
If Company master has no default cash or bank account set but Party has
default company bank account set. In this case, paid_amount and
conversion rate are not calculated correctly
 2023-04-30 08:36:56 +05:30
Vishnu VS
9fd7a05b40
Merge branch 'develop' into develop 2023-04-29 21:02:54 +05:30
rohitwaghchaure
35ee8d19b0
Merge pull request #35092 from rohitwaghchaure/fixed-reserved-qty-issue-for-dn 
fix: not able to create delivery note from sales order
 2023-04-28 16:02:35 +05:30
Rohit Waghchaure
bdf2f7416a fix: not able to create delivery note from sales order 2023-04-28 15:16:02 +05:30
ruthra kumar
4ccce93394 refactor: checkbox to toggle parent doc cost center preference 2023-04-28 14:20:50 +05:30
ruthra kumar
0f3b06cc8a refactor: checkbox in Sales Invoice 2023-04-28 14:20:50 +05:30
ruthra kumar
ebe6787510 refactor: checkbox to toggle parent doc cost center preference 2023-04-28 14:20:48 +05:30
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
Sagar Sharma
d6c5b3e419
Merge pull request #35081 from SolufyPrivateLimited/fix-qc-hyperlink-v14 
fix: Hyperlink in Quality Inspection Summary
 2023-04-28 12:48:53 +05:30
Vishnu VS
489f853ee2
Merge branch 'develop' into develop 2023-04-27 21:17:47 +05:30
Nihantra Patel
72dd7884a8 fix: Hyperlink in Quality Inspection Summary 2023-04-27 17:04:39 +05:30
ruthra kumar
787313b875
Merge pull request #35077 from SolufyPrivateLimited/fix-gp-link-14 
fix: Report link, option, and added a link for Sales Person in GP
 2023-04-27 16:40:45 +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
04902e1b60
Merge pull request #35026 from frappe/revert-34929-fixed-stock-and-account-value-report 
Revert "fix: Incorrect difference value in Stock and Account Value Comparison…"
 2023-04-25 12:08:48 +05:30