Saqib
c3a9ca09d1
chore: remove extra whitespace
2021-12-21 17:05:36 +05:30
Saqib
9c8f523537
fix: typo
2021-12-21 17:01:10 +05:30
Anupam Kumar
b37bc7252d
Merge branch 'develop' into crm-carry-forward-communication-comments
2021-12-21 15:48:41 +05:30
Development for People
076cb408db
fix: missed colon ( #28979 )
2021-12-21 15:48:31 +05:30
Anupam Kumar
27448b9009
Merge branch 'develop' into crm-carry-forward-communication-comments
2021-12-21 15:47:33 +05:30
Anupam
2abbf20da1
fix: test case
2021-12-21 14:13:40 +05:30
Ganga Manoj
1ed30ee7c7
fix: Reset value_after_depreciation on reversing journal entry during Asset return
2021-12-21 13:59:53 +05:30
Deepesh Garg
98ac47caa4
fix: Add is reverse charge in country wise tax
...
(cherry picked from commit 7e912db4b13ee2b1b88a68fc6110eb527a0375d5)
2021-12-21 08:12:09 +00:00
Deepesh Garg
cbef04fded
chore: Remove patch comment
...
(cherry picked from commit 7c1bfe6b46ac3deedacfa666d0695b53b86ec3f6)
# Conflicts:
# erpnext/patches.txt
2021-12-21 08:12:08 +00:00
Deepesh Garg
12a65eef8a
fix: Is Reverse Charge check in Tax Category
...
(cherry picked from commit b33fd6acc769dbfaa43c665c19f378e8e041d010)
# Conflicts:
# erpnext/patches.txt
2021-12-21 08:12:08 +00:00
Anupam
107b405560
fix: test case
2021-12-21 13:35:15 +05:30
Marica
d7c4b8a383
Merge branch 'develop' into independent-manu-entry
2021-12-21 12:55:12 +05:30
Anupam Kumar
c847130ae9
Merge branch 'develop' into crm-carry-forward-communication-comments
2021-12-21 12:52:09 +05:30
marination
24a35c69c0
fix: Sider and Server side test
...
- args passed to wrong function
- missing space around '='
2021-12-21 12:52:03 +05:30
Saqib
da67403bbd
Merge branch 'develop' into so-days-taken-to-deliver
2021-12-21 12:41:48 +05:30
Subin Tom
98d417602f
fix: Added filter for dispatch address ( #28937 )
2021-12-21 12:35:44 +05:30
Anupam Kumar
a8637cc7b8
Merge branch 'develop' into crm-carry-forward-communication-comments
2021-12-21 11:27:47 +05:30
Anupam
e4ee55c9b9
fix: test case
2021-12-21 11:26:53 +05:30
Rucha Mahabal
92e86f2f09
fix: fetch appointment letter content in the same order as template ( #28968 )
2021-12-20 22:56:15 +05:30
Ankush Menat
d7148adee5
test: remove unnecessary creation of companies #28965
...
test: remove unnecessary creation of companies
2021-12-20 22:00:31 +05:30
Marica
d209e5d6c5
Merge branch 'develop' into independent-manu-entry
2021-12-20 21:55:38 +05:30
marination
8951a5c267
fix: Linter (imports)
2021-12-20 21:53:47 +05:30
marination
0f43792dbb
fix: Stock Ageing Report - Negative Opening Stock
...
- Consider negative opening stock in logic and neutralise it with +ve stock
- minor code refactor: class for FIFOSlots to generate chronological FIFO queue
2021-12-20 21:33:59 +05:30
Ankush Menat
2bb7bca464
test: bin qty on backdated SR
2021-12-20 20:05:49 +05:30
Ankush Menat
ff9a6e8e89
fix: correct bin qty on backdated transactions
...
When making a backdated transactions current balance qty depends on
evaluation of whole ledger inbetween, instead of doing that just fetch
the last sle's qty_after_transaction when future transactions are
detected against SLE
fix: don't update bin's actual_qty
1. it's already updated by repost_current_voucher
2. update if future sle exists
2021-12-20 20:05:49 +05:30
Anupam Kumar
66a10c0e73
Merge pull request #28440 from anupamvs/crm-lead-validate-cleanup-develop
...
fix: lead validate function cleanup
2021-12-20 18:12:57 +05:30
Deepesh Garg
c5c7777bd5
Merge pull request #28959 from deepeshgarg007/consolidated_balance_return_fix
...
fix: Error on viewing consolidated financial statement
2021-12-20 17:13:12 +05:30
Ankush Menat
f5d5281119
chore: drop deprecated qunit tests
2021-12-20 17:03:10 +05:30
Deepesh Garg
5d6199cf35
fix: Error on viewing consolidated financial statement
2021-12-20 16:54:52 +05:30
Anupam
c6a87125e9
feat: added forward communication comments check in CRM Settings
2021-12-20 14:14:44 +05:30
Anupam Kumar
ecafea9064
Merge branch 'develop' into crm-carry-forward-communication-comments
2021-12-20 13:37:00 +05:30
Pruthvi Patel
16a90d3e60
Update erpnext/controllers/accounts_controller.py
...
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2021-12-20 13:24:19 +05:30
Pruthvi Patel
4d48ca4228
test: update_invoice_status
2021-12-20 13:23:14 +05:30
Ankush Menat
107b404105
chore: rename FifoValuation to FIFOValuation
2021-12-20 13:20:03 +05:30
Ankush Menat
745caf911a
perf: specify slots on FIFO queue
2021-12-20 13:20:03 +05:30
Ankush Menat
aa0e163b1f
test: hypothesis tests for FIFO queue
2021-12-20 13:20:03 +05:30
Ankush Menat
9d177433cb
fix: return consumed bin on collapsing queue
2021-12-20 13:20:03 +05:30
Ankush Menat
a00d8d02b2
refactor: outgoing rate and defaults for remove_stock
2021-12-20 13:20:03 +05:30
Ankush Menat
db1c0889d3
feat: get consumed bins from Fifo queue on pop
2021-12-20 13:20:03 +05:30
Ankush Menat
1833f7ab81
test: FifoValuation tests
2021-12-20 13:20:03 +05:30
Ankush Menat
e6e679cf7a
fix: round off if near zero while popping from queue
2021-12-20 13:20:03 +05:30
Ankush Menat
a71b476652
feat: repr, eq and iter for fifo queue
2021-12-20 13:20:03 +05:30
Ankush Menat
4b29fb6d08
refactor: move Fifo Valuation to a new class
2021-12-20 13:20:03 +05:30
Pruthvi Patel
0799f378b4
fix: consider Discounted status
2021-12-20 13:18:42 +05:30
Pruthvi Patel
6c96ed4e11
refactor: update_invoice_status with query builder
2021-12-20 13:18:42 +05:30
Anupam
0e0e4f723f
fix: test case
2021-12-20 09:48:40 +05:30
Anupam Kumar
87986aee39
Merge branch 'develop' into crm-carry-forward-communication-comments
2021-12-18 20:13:49 +05:30
Anupam
ba6a6bf391
Merge branch 'crm-carry-forward-communication-comments' of https://github.com/anupamvs/erpnext into crm-carry-forward-communication-comments
2021-12-18 20:13:18 +05:30
Anupam
5b40d9e7cd
fix: linter issues
2021-12-18 20:12:57 +05:30
Dany Robert
fb6bc05138
Merge branch 'develop' into ledger-merger
2021-12-18 17:06:31 +05:30
Dany Robert
0ca467a28f
fix: remove rounding of avg rating ( #28945 )
2021-12-18 16:16:47 +05:30
Dany Robert
e75295a151
Merge branch 'develop' into ledger-merger
2021-12-18 11:32:20 +05:30
Anupam Kumar
321c95d024
Merge branch 'develop' into crm-carry-forward-communication-comments
2021-12-17 23:09:48 +05:30
Dany Robert
ab7f38224f
fix: remove db commit
2021-12-17 16:42:24 +00:00
Dany Robert
32e5db7cb8
chore: styling according to linter
2021-12-17 16:38:16 +00:00
Dany Robert
399446460a
feat: tests
2021-12-17 16:18:42 +00:00
Subin Tom
e85da7a03a
fix: Add Invoice Number field to list view in Opening Inv Creation Tool ( #28938 )
2021-12-17 21:48:10 +05:30
Anupam Kumar
603b367568
Merge branch 'develop' into crm-carry-forward-communication-comments
2021-12-17 19:22:27 +05:30
Anupam
31ac1011b8
feat: made carry-forward comments/communication configurable and added test cases
2021-12-17 19:21:08 +05:30
mergify[bot]
c1a0f649cb
fix: convert asynchronous field update to synchronous ( #28930 )
...
(cherry picked from commit 5adf85f5b7ba94591381b03709b1fee6aa9331a5)
Co-authored-by: Dan Navarro on Ubuntu Work <danjeremynavarro@gmail.com>
2021-12-17 19:06:19 +05:30
Dany Robert
b3a3367d1d
feat: allow group accounts
2021-12-17 13:06:30 +00:00
Deepesh Garg
b139ee1777
Merge pull request #28911 from nextchamp-saqib/fix-ksa-pf
...
fix(ksa): enable ksa pos invoice print format
2021-12-17 13:04:28 +05:30
Deepesh Garg
238403d3f6
Merge pull request #28916 from deepeshgarg007/multicurrency_subscription
...
fix: Multicurrency invoices using subscription
2021-12-17 12:29:10 +05:30
Noah Jacob
4cb5b627a1
fix: mapping to maintenance visit gets erased ( #28917 )
...
* fix: mappings to maintenance visit gets erased
* test: mapping of schedule to visit
2021-12-16 23:06:48 +05:30
Ankush Menat
6ba8f7644d
chore: ledger invariant check report ( #28921 )
2021-12-16 22:31:31 +05:30
Deepesh Garg
6ab753015e
fix: Add tests for multicurrency subscription
2021-12-16 17:38:29 +05:30
Deepesh Garg
0e4842b986
fix: Multicurrency invoices using subscription
2021-12-16 16:51:41 +05:30
Subin Tom
68beee2a00
fix: replaced sql query with frappe.qb
2021-12-16 13:26:21 +05:30
Saqib Ansari
564d23fa8d
fix(ksa): enable ksa pos invoice print format
2021-12-16 11:19:03 +05:30
Subin Tom
9f235526d4
fix: Validation in POS for item batch no stock quantity
2021-12-15 22:34:44 +05:30
DeeMysterio
2be62c279f
feat: provision to have limited parameters for in-process quality ins… ( #28549 )
...
* feat: provision to have limited parameters for in-process quality inspection
* chore: formatting
2021-12-15 19:41:30 +05:30
Ankush Menat
228e011819
perf: remove forcing of posting sort index on stock balance ( #28902 )
...
mysql is generally smart enough to figure out which index is better
based on cardinality of index. While posting sort index is better for
low item high # of SLE scenario it's bad for high item variety each with
lower count of SLEs.
2021-12-15 19:18:41 +05:30
Saqib
6acdb2f00b
feat: Home Onboarding ( #28551 )
2021-12-15 18:02:54 +05:30
HENRY Florian
29f6852c13
feat: Manufacturing : in BOM Operation time can be fix ( #27063 )
...
* feat: Operation time can be fixed
* better coding without duplicate code
* change modified date foir doctype
* undo change
* fix varmixing
* fix varmixing
* fix: remove f-string that's not required anymore
* refactor: use ORM instead of raw query
* fix: improve description
* test: basic test for fixed time
Co-authored-by: Ankush Menat <ankush@frappe.io>
2021-12-15 15:08:31 +05:30
Jannat Patel
af202e715d
Merge branch 'develop' into home-onboarding
2021-12-15 14:28:09 +05:30
Jannat Patel
aba36eb2be
Merge branch 'home-onboarding' of https://github.com/pateljannat/erpnext into home-onboarding
2021-12-15 14:26:47 +05:30
Jannat Patel
63618cc7ab
fix: titles and order
2021-12-15 14:26:44 +05:30
Deepesh Garg
64f68d5e94
Merge branch 'develop' into deferred_report_revenue_and_expense
2021-12-15 14:14:34 +05:30
Subin Tom
5c4d3f89d2
feat: 'Invoice Number' field in Opening Invoice Creation Tool ( #28844 )
2021-12-15 14:14:16 +05:30
Subin Tom
be103ab8e6
fix: Currency fix for cost field in subscription plan ( #28821 )
2021-12-15 13:01:48 +05:30
Saqib
2411477e6d
fix: time to response shows failed ( #28895 )
2021-12-15 11:45:34 +05:30
Saqib
56bc8a52f4
Merge branch 'develop' into home-onboarding
2021-12-15 10:40:40 +05:30
Saqib
8aa9481a11
Merge branch 'develop' into so-days-taken-to-deliver
2021-12-15 10:36:47 +05:30
Saqib
39c6f661f1
revert: "fix: expected value after useful life validation"
2021-12-15 10:34:11 +05:30
Saqib
5cf5412827
Merge pull request #28887 from nextchamp-saqib/sla-fixes-#1
...
fix: reset_expected_response_and_resolution on hold
2021-12-15 09:57:58 +05:30
Rucha Mahabal
a481a7c90e
fix(test): Employee Exit Summary ( #28888 )
2021-12-14 22:03:44 +05:30
ruthra
9ec8841b91
refactor: rename checkbox and translations
...
- rename checkbox and make it
- added translation text for labels
- fixes for linter error
2021-12-14 20:59:14 +05:30
Saqib Ansari
0add80b02f
fix: failing tests
2021-12-14 20:24:29 +05:30
ruthra
9232f75998
refactor: change field to duration and fetch elapsed seconds
2021-12-14 19:45:09 +05:30
Saqib Ansari
c5fcbeff7a
fix: reset_expected_response_and_resolution on hold
2021-12-14 18:45:27 +05:30
Ankush Menat
96ef88d935
test: remove commits from tests ( #27939 )
...
* test: remove commits from tests in selling module
* test: remove commits from manufacturing module
* test: remove commits from accounts module tests
* test: remove commits from controller tests
* test: keep commits in accounting dimension test
* Revert "test: remove commits from controller tests"
This reverts commit f5cfbee5da844f8b2bffeee907ac602754f16ff4.
* Revert "test: remove commits from accounts module tests"
This reverts commit df4c27efddf355e2731a18e8871e54d18590f219.
2021-12-14 17:36:35 +05:30
Ankush Menat
66960cf050
fix: remove set only once from valuation method ( #28876 )
2021-12-14 17:12:46 +05:30
Ankush Menat
80f1a8c645
fix: incorrect logic for "Reserved Qty for Production" ( #28880 )
...
* fix: reservation for production incorrect
The query uses case to decide what fields to compute reservation on,
this case is outermost case hence the very first Work order's "Skip
transfer" is considered for ALL work orders.
Solution: move the case inside Sum.
Steps to reproduce:
1. Make work order for more than 1 qty (with | without skip transfer)
2. Create manufacture and transfer entries.
3. Keep checking reserved quantities during this process.
* test: use default warehouse for testing reservation
2021-12-14 17:02:42 +05:30
Anupam Kumar
ea5e155823
Merge branch 'develop' into crm-carry-forward-communication-comments
2021-12-14 16:42:59 +05:30
ruthra
a8a598ace7
refactor: remove unused function 'get_postings'
2021-12-14 16:34:51 +05:30
aaronmenezes
304aa44feb
fix: Nonstock item showing in Itemwise Recommended Reorder Level report ( #28873 )
2021-12-14 15:18:03 +05:30
Rucha Mahabal
b027050f77
Merge pull request #28845 from ruchamahabal/fix-salary-slip-timesheet
...
fix: incorrect amount based on payment days in timesheet salary slip
2021-12-14 14:57:21 +05:30
Ankush Menat
7fd06108bf
fix: reorder patch to fix custom field options ( #28866 )
2021-12-14 13:03:53 +05:30
Deepesh Garg
6749d8e6c9
Merge pull request #28832 from deepeshgarg007/ksa_e_invoice_patch_fix
...
fix: KSA QR field rename patch
2021-12-14 12:47:58 +05:30
Noah Jacob
cc8c0595e2
fix(UX): hide RM table(Job Card) if material transfer is against work order ( #28746 )
2021-12-14 12:20:04 +05:30
Noah Jacob
db46257a3b
feat: added required_date field to set date in child table ( #28432 )
...
* feat: added required_date field to set date in child table
* fix: dont refresh full table
Co-authored-by: Ankush Menat <ankush@frappe.io>
2021-12-14 12:12:33 +05:30
Ankush Menat
534c64abcd
fix: packing slip incorrect item value ( #28862 )
2021-12-14 11:55:09 +05:30
Saqib
ae71b704ff
Merge pull request #28783 from nextchamp-saqib/hsn-wise-summary-report-fix
...
fix: hsn-wise summary is incorrect if an invoice has repeated item code
2021-12-13 22:39:32 +05:30
Saqib Ansari
2137e56947
revert: "fix: expected value after useful life validation"
2021-12-13 22:34:54 +05:30
Saqib
4984513597
Merge pull request #28677 from GangaManoj/fix-adjust-asset-value
...
fix: Fix 'Adjust Asset Value' button
2021-12-13 21:51:09 +05:30
Saqib
ce80585d51
fix: Clear Depreciation Schedule before modification ( #28507 )
2021-12-13 21:49:43 +05:30
Saqib Ansari
6a239c8ea3
test: test_hsn_summary_for_invoice_with_duplicate_items
2021-12-13 20:58:35 +05:30
Saqib
c3e0de28b1
fix: validate if asset account is set against company
2021-12-13 20:13:53 +05:30
Jannat Patel
74d086ffd1
Merge branch 'develop' into home-onboarding
2021-12-13 17:51:38 +05:30
ruthra
2813e5ee29
feat: new column 'Time taken to Deliver' in sales order analysis
2021-12-13 12:26:23 +05:30
Ankush Menat
a388096c03
Merge pull request #28839 from ankush/migration_hashes
...
fix: remove migration hashes from doctypes
2021-12-13 11:27:27 +05:30
Saqib
7d0a3e4e8b
Merge pull request #28550 from nextchamp-saqib/fix-sla
...
refactor(SLA): Application of SLA and its fields
2021-12-13 10:29:56 +05:30
Rucha Mahabal
bb97309e2e
fix: tests
...
- specify sorting order in employee exits query
- rollback after work order tests
2021-12-12 23:20:04 +05:30
Rucha Mahabal
e93694d0ab
fix: missing import
2021-12-12 23:02:44 +05:30
Rucha Mahabal
1867bad693
Merge branch 'develop' into exit-interview
2021-12-12 22:13:11 +05:30
Saqib Ansari
e74739a677
fix: hsn-wise summary is incorrect if an invoice has repeated item code
2021-12-12 19:53:33 +05:30
Deepesh Garg
b966c45fa8
Merge pull request #28748 from deepeshgarg007/accounts_receivable_jv_due_date
...
fix: Ageing in AR/AP report for advances
2021-12-12 17:27:21 +05:30
Deepesh Garg
a6fba7f128
Merge pull request #28764 from deepeshgarg007/tds_report_fixes
...
fix: TDS Monthly payable report
2021-12-12 17:11:58 +05:30
Deepesh Garg
14d03a9446
fix: KSA QR field rename patch
2021-12-12 12:55:30 +05:30
Himanshu
624481be6f
feat(buying): quotation number in supplier quotation ( #28420 )
2021-12-11 11:51:59 +00:00
ruthra
c3453cd73c
feat: Deferred Revenue and Expense report
...
- show deferred revenue and expense with actual and expected postings
- unit tests added
2021-12-10 19:30:43 +05:30
Dany Robert
75de5be53e
fix: import issue and minor fixes
2021-12-10 10:27:15 +00:00
Dany Robert
614b9270e7
fix: convert whitespace to tabs
2021-12-10 09:45:00 +00:00
Dany Robert
7554f11260
feat: progress bar, account name field
2021-12-10 08:45:47 +00:00
Ankush Menat
75bc404cbe
test: stock frozen validation
2021-12-10 12:39:38 +05:30
Ankush Menat
d37541d3fb
fix: ensure that reposting is finished before freezing stock/account
2021-12-10 12:31:49 +05:30
Dany Robert
b7cc20eac0
Merge branch 'develop' of https://github.com/rtdany10/erpnext into ledger-merger
2021-12-09 15:26:45 +00:00
Dany Robert
75f8117daf
feat: merge functionality
2021-12-09 15:23:10 +00:00
Dany Robert
57a7633f9b
feat: form updates and progressbar
2021-12-09 15:22:46 +00:00
Noah Jacob
f1c0190f02
feat: added QI link in Job Card Dashboard ( #28643 )
2021-12-09 20:21:17 +05:30
Dany Robert
ad5d7897a8
feat: ledger merger doctype
2021-12-09 13:31:54 +00:00
Sagar Sharma
6485ac4e59
fix: misleading "Set Default X" fields after saving ( #28798 )
...
* fix: misleading "Set Default X" fields after saving
* refactor: remove unncessary code and minor formatting
* fix: extend to more doctypes and correct fieldnames
Co-authored-by: Ankush Menat <ankush@frappe.io>
2021-12-09 17:04:00 +05:30
Ankush Menat
c64d5028b4
fix: deduplicate after finishing the repost ( #28803 )
...
Not really a bug but avoids potential of prematurely skipping something
if failure occurs and failure isn't resolved.
2021-12-09 13:45:44 +05:30
Michael Köller
f043f59324
fix: wrong german translation of abbreviation PAN
...
Wrong german translation of abbreviation: PAN
2021-12-09 11:31:25 +05:30
Deepesh Garg
121f8ae865
Merge pull request #28776 from rtdany10/ksa-vat-updates
...
feat(Regional): KSA E-Invoing optimizations and POS support
2021-12-08 22:32:24 +05:30
Ganga Manoj
51c707a0ce
Merge branch 'develop' into fix-adjust-asset-value
2021-12-08 19:20:23 +05:30
Ganga Manoj
539cba1b15
Merge branch 'develop' into fix-clear-depr-schedule
2021-12-08 19:19:33 +05:30
Ankush Menat
96a019ec49
test: add multi-batch negative qty test
2021-12-08 15:52:40 +05:30
Ankush Menat
f0152d03a4
test: simplfy test and expect specific exception
2021-12-08 15:52:40 +05:30
Ankush Menat
9c90b7a40d
refactor: remove redundant batch qty validation
...
This check was only checking total sum, which is problamatic when making
backdated entries that can cause intermediate values to go negative
while overall values stay positive.
2021-12-08 15:52:40 +05:30
Ankush Menat
5eba57528c
fix: check future negative stock for batches
...
batch's ledger is only maintained in form of `actual_qty` on batch's
SLEs. To validate if batch has any negative qty in future, cumulative
total of `actual_qty` is required to ensure it never goes negative.
2021-12-08 15:52:40 +05:30
18alantom
1cbeba5f1d
test: check execution of illegal stock entry seq
2021-12-08 15:52:40 +05:30
aaronmenezes
90b98440e2
fix: Maintenence Visit -Purpose (item ) tables is not visible on submitted or saved entries ( #28792 )
2021-12-08 14:48:19 +05:30
Deepesh Garg
d5380dd716
fix: Error on Invoice generation
...
(cherry picked from commit 82255293c4eb8a9f586db083d19d63c1ea435fb9)
2021-12-08 08:42:29 +00:00
Dany Robert
4a316550f4
chore: POS invoice format changes
2021-12-08 07:25:41 +00:00
Deepesh Garg
948b67b744
Merge branch 'develop' into ksa-vat-updates
2021-12-08 09:38:11 +05:30
Dany Robert
3e97492da4
fix: replace frappe.get_all
2021-12-08 08:03:30 +05:30
Dany Robert
5b20746311
chore: switch to ORM method
2021-12-08 07:53:45 +05:30
Dany Robert
ca85094728
chore: switch to frappe.db.set_value
2021-12-08 07:52:06 +05:30
Rucha Mahabal
dcbf0c9eca
fix: tests and sider issues
2021-12-07 23:40:10 +05:30
