Commit Graph

30552 Commits

Author SHA1 Message Date
Noah Jacob
4f52b86d7e refactor: update_serial_no function and code cleanup 2021-12-15 15:24:39 +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 Ansari
5a7a9a598b chore: rename redefinition of multiple pricing rule test 2021-12-15 10:32:23 +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
Saqib Ansari
c0d1f4869f test: add test_multiple_pricing_rules 2021-12-14 14:58:31 +05:30
Saqib Ansari
1e17d6a607 fix: qty filter not working if apply_multiple_pricing_rules is enabled 2021-12-14 14:58:20 +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
Dany Robert
0592096c62
Merge branch 'develop' into currency-exchange-settings 2021-12-07 22:36:36 +05:30
Deepesh Garg
cb21dff882 fix: Error on creating invoice
(cherry picked from commit e11515a3561eac6d33d21190cac2db112ae301fb)
2021-12-07 16:51:02 +00:00
Dany Robert
15373f1b2d
fix: intendation error 2021-12-07 18:34:34 +05:30
Dany Robert
45fce5a64b
chore: linters 2021-12-07 18:29:16 +05:30
Dany Robert
2df641eb54
feat(Regional): rename qr field and disable print formats 2021-12-07 18:13:35 +05:30
Dany Robert
9c68d8e35c
Merge branch 'frappe:develop' into ksa-vat-updates 2021-12-07 18:10:26 +05:30
Dany Robert
a0aeacee8e fix: reload doc 2021-12-07 12:39:39 +00:00
Dany Robert
bb3119cd1f feat(Regional): enable KSA print formats on setup 2021-12-07 11:05:41 +00:00
Dany Robert
293d981af9 feat(Regional): POS Invoice format for KSA 2021-12-07 11:03:22 +00:00
Dany Robert
2256155e80 feat(Regional): patch to disable ksa print formats for other countries 2021-12-07 11:02:28 +00:00
Dany Robert
09f178ceee fix: disable ksa vat invoice by default 2021-12-07 11:01:37 +00:00
Dany Robert
c5c47e9fad feat: generate QR Code for POS transactions 2021-12-07 11:01:02 +00:00
Ankush Menat
6efbbb1058
fix: ignore mandatory fields while creating WO from SO (#28772)
If fields are made mandatory from customizations the WO creation simply
fails.
2021-12-07 16:26:14 +05:30
Rucha Mahabal
4686527928
Merge branch 'develop' into exit-interview 2021-12-07 16:23:31 +05:30
Rucha Mahabal
c305ff911f test: Employee Exits Report 2021-12-07 16:22:17 +05:30
Deepesh Garg
3e1591c145
Merge pull request #28731 from deepeshgarg007/better_deferred_revenue_error_logging
fix: Better Error logging for deferred revenue/expense booking
2021-12-07 15:42:05 +05:30
Dany Robert
b3bd14fcfa
Merge branch 'frappe:develop' into ksa-vat-updates 2021-12-07 15:33:27 +05:30
Dany Robert
811e51fb50
fix: reload SI meta before checking 2021-12-07 15:21:51 +05:30
Ankush Menat
ca230e4267
test: index test should pass without calling function #28771
test: index test should pass without calling function

[skip ci]
2021-12-07 15:11:31 +05:30
Rucha Mahabal
ef38b127ae chore: fix report column widths 2021-12-07 15:02:00 +05:30
Rucha Mahabal
8db21e065c test: Exit Interview 2021-12-07 14:55:17 +05:30
Dany Robert
848b641d7b
fix: rename KSA QR field to match localisation 2021-12-07 14:51:05 +05:30
Rucha Mahabal
0a937dc050 fix: show Exit Questionnaire button only to the users with write access
- fix linter issues
2021-12-07 13:04:23 +05:30
Dany Robert
d06c4b50cd
feat: create QR field in POS Invoice 2021-12-07 12:29:59 +05:30
Dany Robert
f0fee5672f
chore: change QR field label 2021-12-07 12:18:32 +05:30
Dany Robert
6a6d6f7f8b
fix: localize QR fieldname 2021-12-07 12:17:45 +05:30
Dany Robert
ebd4179295
fix: get doctype from doc instead of hardcoding SI 2021-12-07 12:15:58 +05:30
Dany Robert
276bf73974
feat: create QR Code field if not existing 2021-12-07 12:11:43 +05:30
Deepesh Garg
d106d59c3f fix: TDS Monthly payable report 2021-12-06 20:36:48 +05:30
Saqib Ansari
2f7d8ac29e fix: indentation 2021-12-06 19:19:34 +05:30
Saqib Ansari
3446f7545f fix: remove 'ongoing' status from issue summary report 2021-12-06 19:17:38 +05:30
Saqib Ansari
91aa78707c fix: remove missed 'ongoing' references 2021-12-06 19:13:31 +05:30
Saqib Ansari
476e81a631 fix: time to respond & resolve indicators 2021-12-06 18:55:30 +05:30
Saqib Ansari
1a76b3801a fix: test 2021-12-06 17:06:20 +05:30
Saqib Ansari
10b87e081c fix: sider issues 2021-12-06 15:38:19 +05:30
Saqib Ansari
32c81818f6 fix: transalations 2021-12-06 15:38:01 +05:30
Deepesh Garg
3dabac15ed fix: Ageing in AR/AP report for advances 2021-12-06 15:05:20 +05:30
Saqib
8e5b793a0a
Merge branch 'develop' into fix-sla 2021-12-06 14:48:09 +05:30
Saqib Ansari
812572d250 feat: record assignment on first response failure 2021-12-06 14:46:51 +05:30
Saqib Ansari
c1d8877a83 refactor: handle special cases on communication creation 2021-12-06 14:34:59 +05:30
Ankush Menat
ef53eb7fcd
Merge pull request #28745 from noahjacob/maint_batch_map
refactor: map serial from schedule if only one
2021-12-06 14:34:06 +05:30
Anupam Kumar
3928a402d4
feat: CRM Settings (#27788)
* feat: crm settings

* feat: CRM Settings

* feat: lead and opprtunity section

* feat: added CRM Settings in ERPNext Settings workspace

* fix: review chnages

* added patch

* fix: linter issues

* fix: linter issues

* fix: linter issues

* fix: removed crm settings from selling module

* fix: raw query to frappe.qb

* fix: removed hardcoded value

* fix: linter issue

* fix: simplify CRM Settings migration patch

Co-authored-by: Anupam Kumar <anupam@Anupams-MacBook-Air.local>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-12-06 13:52:00 +05:30
Noah Jacob
eb522a3746 refactor: map serial from schedule if only one 2021-12-06 13:43:02 +05:30
Saqib Ansari
f9408d170a patch: split 'ongoing' sla status 2021-12-06 12:38:25 +05:30
Deepesh Garg
c56a450474
Merge pull request #28656 from nemesis189/taxjar-nexus-display-condition
fix: Taxjar Nexus list visible only if child table is visible
2021-12-06 11:44:11 +05:30
Saqib
b1ba98c129
feat: Make Depreciation Entry posting more flexible (#28421) 2021-12-06 11:43:09 +05:30
Saqib Ansari
56df646067 fix(test): test_depr_entry_posting_with_income_account 2021-12-06 11:19:58 +05:30
Ankush Menat
a8375239eb test: set customer group and territory defaults 2021-12-06 11:07:24 +05:30
Ankush Menat
bdf7b8d379 fix: patch to remove default item group and territory 2021-12-06 11:07:24 +05:30
Ankush Menat
105b6d498c fix: remove bad defaults from selling settings
"All cusotmer groups" and "All territories" are pointless defaults, not
sure why these are made default. They don't help you track anything.
"All" might as well be `Null`.

Even the filters for customer_group suggest it shouldn't be group then
having the root as default makes no sense.
2021-12-06 11:07:24 +05:30
Rucha Mahabal
3230741cde fix: email summary 2021-12-06 10:08:51 +05:30
Rucha Mahabal
b69e0d2c63 feat: default Notification - a day before Exit Interview 2021-12-05 22:28:22 +05:30
Rucha Mahabal
1c09439d03 chore: update HR workspace 2021-12-05 22:06:19 +05:30
Rucha Mahabal
3437f568be feat: Employee Exits report 2021-12-05 21:55:13 +05:30
Rucha Mahabal
d67536cc8d feat: update Exit Interview date in employee master on submission 2021-12-05 19:55:25 +05:30
Rucha Mahabal
e30187f246 feat: bulk questionnaire sending 2021-12-05 19:32:33 +05:30
Rucha Mahabal
09fdfed163 fix: make Exit Interview submittable 2021-12-05 18:28:23 +05:30
Rucha Mahabal
1347187a30 feat: track status and final decision (Retained/Exit Confirmed) 2021-12-05 17:20:39 +05:30
Rucha Mahabal
235b707417 feat: add default Exit Questionnaire email template 2021-12-05 17:06:29 +05:30
Rucha Mahabal
7412accf6d feat: sending Exit Questionnaire 2021-12-05 17:02:19 +05:30
Rucha Mahabal
36a2d8ee0d feat: Exit Interview 2021-12-05 14:42:27 +05:30
Rucha Mahabal
0ef42d1000
fix(patch): create only component type field instead of running the whole setup (#28734) 2021-12-05 12:44:20 +05:30
Deepesh Garg
3c64e201cc fix: Log error before throwing exception 2021-12-04 20:05:37 +05:30
Deepesh Garg
0ba4fcee2a fix: Commit joural entries 2021-12-04 19:25:44 +05:30
Deepesh Garg
67a001d876 fix: Better Error logging fordeferred revenue/expense booking 2021-12-04 19:19:03 +05:30
rohitwaghchaure
fc4e6a2bed
Merge pull request #28710 from noahjacob/calc_outgoing_stock_entry
fix: incorrect outgoing rates when material_consumption enabled
2021-12-04 12:34:33 +05:30
Ankush Menat
ba5a7ffd60 fix: weird item sorting by idx 2021-12-03 19:08:06 +05:30
Ankush Menat
5caf411be3 fix: remove autocommit from item rename 2021-12-03 18:47:53 +05:30
Ankush Menat
72dbc3d6b8 fix!: dont allow renaming warehouse primary key 2021-12-03 18:47:53 +05:30
Noah Jacob
35346de162 test: added tests for manufacture stock entry when material_consumption is enabled 2021-12-03 17:21:49 +05:30
Saqib Ansari
defa01edac fix: undo removing of resolution_time fields 2021-12-03 16:22:10 +05:30
Saqib
7511a9ed31
fix(ksa): qrcode for invoices with special chars (#28715) 2021-12-03 16:13:44 +05:30
Deepesh Garg
a8f283bb20
Merge pull request #28708 from deepeshgarg007/ksa_qr_invoice_total
fix: Invoice amount in KSA E Invoice QR Code
2021-12-03 15:18:15 +05:30
Noah Jacob
7f3e6d149a fix: incorrect outgoing rates when material_consumption enabled 2021-12-03 15:11:18 +05:30
Ankush Menat
cef84c25a7 refactor: simplify the way SLEs are submitted 2021-12-03 14:51:25 +05:30
Ankush Menat
97060c45e9 refactor: replace misleading variable name 2021-12-03 14:51:25 +05:30
Deepesh Garg
f2ffddf059 fix: Invocie amount in KSA E Invoice QR Code 2021-12-03 14:32:52 +05:30
Deepesh Garg
c339240250
Merge pull request #28698 from frappe/mergify/bp/develop/pr-28654
fix: Taxes and Charges template not getting copied from Purchase Order/Receipt to Invoice (backport #28654)
2021-12-03 14:26:43 +05:30
Saqib
7091ca6812
Merge branch 'develop' into fix-sla 2021-12-03 11:53:25 +05:30
Rucha Mahabal
0b1808e1ee
fix(Non Profit): fetch memberships for 80G certificate by from date only (#28700) 2021-12-03 11:46:14 +05:30
Saqib Ansari
1e550d3e46 fix: failing tests 2021-12-03 11:36:53 +05:30
Saqib
9c60c45acf
fix: Create Depreciation Schedules for existing Assets accurately (#28675) 2021-12-03 11:30:47 +05:30
Saqib
7314aee394
fix: qrcode image name for invoices with special chars (#28699) 2021-12-03 11:29:51 +05:30
Deepesh Garg
35e2bd89c0 fix: India utils code cleanup
(cherry picked from commit 56c626adbfbd04e7e9063f6500ec380f7bfb3da4)
2021-12-03 04:12:43 +00:00
Deepesh Garg
f12be3001d fix: Taxes and Charges template not getting copied from Purchase Order/Receipt to Invoice
(cherry picked from commit 6a75e8d283bb76214af832bb0a29c20eefae328c)
2021-12-03 04:12:42 +00:00
Deepesh Garg
107fb43d6a fix: Paid showing in AR/AP report
(cherry picked from commit 5e7ce5370f6af634f7674772529cf4933114f3ef)
2021-12-02 13:44:27 +00:00
Saqib Ansari
6736a89b4e fix: failing tests 2021-12-02 15:54:02 +05:30
Ankush Menat
a37c99a23d
fix: dont requeue repost immediately and clear progress (#28684) 2021-12-02 14:51:04 +05:30
Saqib Ansari
a1cedc3ea0 fix: failing tests 2021-12-02 14:48:24 +05:30
Saqib Ansari
6f67bbca69 refactor(SLA): remove response_by_variance & resolution_by_variance 2021-12-02 13:39:05 +05:30
Saqib
fa42cf796b
Merge branch 'develop' into depreciate-existing-asset 2021-12-02 12:13:12 +05:30
Saqib
4889661e5c
fix: actual tax conversion in case of multicurrency invoices (#28539) 2021-12-02 11:37:08 +05:30
Saqib
92860f46ac
Merge branch 'develop' into taxjar-nexus-display-condition 2021-12-02 11:35:26 +05:30
Ganga Manoj
9bc28210c9
fix: Make buttons translatable (#28679) 2021-12-02 11:31:38 +05:30
Jannat Patel
a108df8efc fix: assigned proper form tour to onboarding steps 2021-12-02 11:27:37 +05:30
Jannat Patel
427938f87b fix: new item form tour for home onboarding 2021-12-02 11:25:47 +05:30
Saqib
38cbaa3168
Merge branch 'develop' into depreciate-existing-asset 2021-12-02 11:20:49 +05:30
GangaManoj
4629308d94 fix: Rename function 2021-12-02 01:22:18 +05:30
GangaManoj
5b224f841b fix: Rename variable 2021-12-02 01:19:35 +05:30
GangaManoj
6f1cf94c9f fix: Fix 'Adjust Asset Value' button 2021-12-02 01:18:30 +05:30
GangaManoj
828769ca70 fix: Remove unnecessary variable 2021-12-02 01:09:15 +05:30
Ganga Manoj
dc3449c304
Merge branch 'develop' into product-bundle-fixes 2021-12-01 23:27:40 +05:30
GangaManoj
774ac852c9 fix: Test if depreciation schedules are set up properly for existing assets 2021-12-01 22:51:55 +05:30
GangaManoj
de002005ac fix: Modify has_pro_rata() to include existing assets 2021-12-01 22:51:08 +05:30
GangaManoj
5c3d4caeda fix: Create Depreciation Schedules properly for existing Assets 2021-12-01 21:48:47 +05:30
GangaManoj
22cc8d2246 fix: Fix depreciation_amount calculation 2021-12-01 21:46:09 +05:30
Ankush Menat
fdffa037b5
test: dynamic fiscal year creation in tests (#28667) 2021-12-01 17:31:17 +05:30
Ankush Menat
445966ab80
test: timeout certain tests in work order to avoid stuck tests (#28666)
[skip ci]
2021-12-01 16:34:05 +05:30
Saqib
802d583031
Merge branch 'develop' into taxjar-nexus-display-condition 2021-12-01 15:22:39 +05:30
Dany Robert
3708cf17ad
fix(POS Profile): replace cur_frm with frm (#28390) 2021-12-01 12:14:06 +05:30
Saqib
01d8b8519f
fix: cannot load company form (#28535) 2021-12-01 12:11:30 +05:30
Subin Tom
ecc5de6159 fix: removing db call for variables 2021-12-01 11:54:59 +05:30
Sagar Vora
ab280f7142
fix: update modified timestamp for delivery note #28657
fix: update `modified` timestamp for delivery note
2021-12-01 11:01:49 +05:30
GangaManoj
a473e1dbe9 fix: Add item to packing list 2021-12-01 01:29:35 +05:30
Subin Tom
0963fceede fix: Taxjar Nexus list visible only if child table is visible 2021-11-30 22:05:29 +05:30
mergify[bot]
071118fa4e
fix: Unable to search project by project name in Sales Invoice (bp #28648)
(cherry picked from commit 08b7c856b2ee94d1f8ac2c019c556eef4d7dd7da)

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2021-11-30 13:15:20 +00:00
Deepesh Garg
ad8d296c08
Merge pull request #28636 from deepeshgarg007/zero_values_report
feat: Show Zero Values filter in consolidated financial statement
2021-11-30 18:15:50 +05:30
Ankush Menat
0854c183aa
chore: remove duplicate code (#28646)
[skip ci]
2021-11-30 17:57:53 +05:30
Raffael Meyer
e10ab1626c
feat: Grant commission on certain items only (#27467)
Co-authored-by: Sagar Vora <sagar@resilient.tech>
2021-11-30 17:54:18 +05:30
Rucha Mahabal
d0f4f03b66
fix: Employee Transfer and Project Profitability test cases (#28633)
* fix: Employee Transfer testcases

* fix: Project Profitability test case
2021-11-30 14:04:47 +05:30
Deepesh Garg
9610086d0c feat: Show Zero Values filter in consolidated financial statement 2021-11-30 13:24:23 +05:30
Ankush Menat
aeb62af544 fix(ux): remove attachment limits 2021-11-30 12:46:53 +05:30
Rucha Mahabal
4458b24813
fix: allow creating Shift Assignment for same day (#28613) 2021-11-30 10:15:41 +05:30
Anupam Kumar
83e3e58fe9
Merge branch 'develop' into crm-carry-forward-communication-comments 2021-11-30 10:11:23 +05:30
Saqib
fb14b0901c
feat: Let serialised Items be consumed during Asset Repairs (#28349) 2021-11-29 20:42:56 +05:30
Subin Tom
2f6a6afaa8
feat(pos): Total item qty field to POS screen (#28331) 2021-11-29 20:35:49 +05:30
Ganga Manoj
7a15f85f22
Merge branch 'develop' into serialized-item-consumption 2021-11-29 20:01:11 +05:30
Deepesh Garg
0d9b0fe6dc
Merge pull request #28464 from mhbu50/develop
fix:Change QR Code Triggerr event
2021-11-29 18:46:56 +05:30
Deepesh Garg
4382040fb6
fix: Move trigger from on trash to on cancel 2021-11-29 18:25:47 +05:30
Deepesh Garg
641f033337
Merge pull request #28385 from vorasmit/fix-hsn_wise
fix(regional): `hsn_wise` as false returns `item_code`
2021-11-29 18:08:34 +05:30
rohitwaghchaure
f872878638
Merge pull request #28500 from rohitwaghchaure/feat-report-to-view-consumed-materials
feat: report to see the consumed materials against the work order
2021-11-29 17:53:44 +05:30
rohitwaghchaure
3d2efb76d3
fix: linters issue 2021-11-29 17:52:55 +05:30
rohitwaghchaure
56b5ac0939
Merge pull request #28611 from rohitwaghchaure/changed-fieldtype-from-int-to-float
fix: changed fieldtype from int to float for the field Batch Size in the Work Order Operation table
2021-11-29 17:13:24 +05:30
Deepesh Garg
2bed4140f3
Merge pull request #28605 from deepeshgarg007/ksa-e-invoice-new
refactor(KSA VAT): QR Code as per ZATKA specification
2021-11-29 16:46:14 +05:30
Rohit Waghchaure
7fac9b8e9c fix: changed fieldtype from int to float for the field Batch Size in the work order 2021-11-29 16:40:55 +05:30
vorasmit
e5ca9f3c1b
Merge branch 'develop' into fix-hsn_wise 2021-11-29 16:33:21 +05:30
rohitwaghchaure
570ae422a8
Update work_order_consumed_materials.py 2021-11-29 16:25:30 +05:30
Deepesh Garg
af6fc29770 fix: KSA print format for invoices not having item codes 2021-11-29 16:18:35 +05:30
Saqib
c0cc72ec1d
fix: incorrect discount amount set when item is replaced (#28556) 2021-11-29 15:05:06 +05:30
Rucha Mahabal
baf41fdc9c
fix: Employee Advance paid amount not updated on PE cancellation (#28572)
* fix: employee advance paid amount not updated on PE cancellation

* fix: convert raw sql queries to qb

* test: Employee Advance Paid Amount on PE cancellation

* chore: disable no copy for sanctioned amount in Expense Claim
2021-11-29 14:23:06 +05:30
Deepesh Garg
f3f7ed6f0d fix: Translations 2021-11-29 13:43:56 +05:30
Ahmad
31b9b84fdf fix: KSA VAT QR Code arabic conversion 2021-11-29 13:43:02 +05:30
Ahmad
de784d8bfe refactor: comments removed 2021-11-29 13:43:02 +05:30
Ahmad
d1746caa02 refactor(KSA VAT): QR Code as per ZATKA specification 2021-11-29 13:43:02 +05:30
Ankush Menat
c7701ace80 chore: correct docstrings 2021-11-29 13:04:29 +05:30
Ankush Menat
f862339024 fix: use get_all instead of get_list for child tables 2021-11-29 13:04:29 +05:30
Anupam Kumar
d4f57d3a4f
Merge branch 'develop' into crm-carry-forward-communication-comments 2021-11-29 12:15:03 +05:30
Jannat Patel
8cc1dc8079
Merge branch 'develop' into home-onboarding 2021-11-29 10:24:06 +05:30
Himanshu
de6f104b74
Delete __init__.py 2021-11-27 23:16:34 +00:00
hrwx
43038aab79 fix: do not add gst fields if no indian company 2021-11-27 21:46:13 +00:00
xdlumertz
cdaf0a04cf
fix(ux): allow translations (#28455)
* Translation

* Translations

Co-authored-by: xdlumertz <alexandrelumertz@gmail>
2021-11-27 15:03:35 +00:00
Ankush Menat
69a17b9e51
refactor: move Bin queries to qb/orm (#28522) 2021-11-27 20:07:02 +05:30
Saqib Ansari
79f8159ab9 test: issue closing after being on hold 2021-11-27 17:14:58 +05:30
Saqib Ansari
267cc35850 fix: failing tests 2021-11-27 16:47:45 +05:30
Ganga Manoj
7bbc708e8a
Merge branch 'develop' into serialized-item-consumption 2021-11-26 20:44:35 +05:30
Saqib Ansari
214d0e367f fix: remove leading whitespace 2021-11-26 20:20:38 +05:30
Saqib Ansari
a8c75b6862 refactor: application of SLA and its metrics 2021-11-26 20:16:21 +05:30
Noah Jacob
7ff30a4b2b
fix: incorrect balance for warehouses (#28583) 2021-11-26 17:33:57 +05:30
Ankush Menat
efec85d5cd
chore: correct __version__ on develop branch. (#28582) 2021-11-26 16:29:21 +05:30
Saqib Ansari
210f593a49 refactor: SLA form fields 2021-11-26 15:49:17 +05:30
Deepesh Garg
38dfb60243
Merge pull request #27348 from deepeshgarg007/advance_tds_allocation_gl
fix (refactor): Tax Withholding for Advances using Payment Entry against suppliers
2021-11-26 14:28:50 +05:30
marination
dfff972a78 fix: Linter (imports) 2021-11-26 13:29:05 +05:30
Rucha Mahabal
ca8dec0cf2
fix: Use get_all instead of get_list for child doctype (#28538)
* fix(Student Attendance Tool): Use `get_all` instead of `get_list` for child doctype

* fix(Course Schedule): incorrect fetch from value

* fix: sider

* fix(Gratuity): Use `get_all` instead of `get_list` for child doctype
2021-11-26 13:24:32 +05:30
Marica
26207d9517
Merge branch 'develop' into independent-manu-entry 2021-11-26 13:20:33 +05:30
marination
affb29194b test: Independent Manufacture Entry
- Check validations
- Check if FG basic rate is calculated correctly
2021-11-26 13:19:04 +05:30
Shariq Ansari
2a5f663a1e
fix: Customer, Supplier heatmap data not rendering (#28553)
* fix: adding get_timeline_data import on supplier.py, customer.py
2021-11-26 12:58:43 +05:30
Saqib
9c913c9b2d
fix: over billing validation (#28218) 2021-11-26 12:00:13 +05:30
Noah Jacob
73bfd59846
fix: checkbox triggers get_items and sub_assembly buttons (#28558) 2021-11-26 11:53:35 +05:30
Deepesh Garg
7f06c8ca57 fix: Incorrect indentation 2021-11-26 10:27:57 +05:30
Deepesh Garg
f07f010962 fix: Add tests 2021-11-25 23:58:16 +05:30
GangaManoj
c94f1ed39a fix: Change order of import statements 2021-11-25 22:18:57 +05:30
GangaManoj
b28f137ee8 fix: Remove unused import 2021-11-25 22:17:54 +05:30
GangaManoj
6b75d1439f fix: Add test for consumption of serialized Assets 2021-11-25 22:10:24 +05:30
Ganga Manoj
209750d036
Merge branch 'develop' into depr-expense-account 2021-11-25 20:01:58 +05:30
Ganga Manoj
43b8936f1c
Merge branch 'develop' into fix-clear-depr-schedule 2021-11-25 20:01:06 +05:30
Ganga Manoj
a1055d6bd3
Merge branch 'develop' into product-bundle-fixes 2021-11-25 20:00:30 +05:30
Ankush Menat
87f2dcfb59
fix: total stock summary UI glitch #28564
fix: total stock summary UI glitch
2021-11-25 19:38:44 +05:30
GangaManoj
efac7b0904 fix: Create setUpClass 2021-11-25 19:02:01 +05:30
GangaManoj
eea80b6c01 fix: Create stock item 2021-11-25 19:01:22 +05:30
GangaManoj
c9e79ef1f2 fix: Replace 'item' with 'item_code' in tests 2021-11-25 18:53:48 +05:30
Ankush Menat
8b33358660 fix: patch failure due to new doctype 2021-11-25 17:41:29 +05:30
Ankush Menat
0a2964dc82 fix: ignore permissions while creating reposts 2021-11-25 16:37:19 +05:30
Ankush Menat
ed94f0f3f2 refactor: deduplicate during repost background job 2021-11-25 16:37:19 +05:30
Ankush Menat
55631dd0d6 test: item-wh deduplication in reposting 2021-11-25 16:37:19 +05:30
Ankush Menat
0d0e24a5f5 perf: skip unnecessary item-wh reposts
Using basic idea that repost with older posting date will also take care
of subsequent posting dates...

When Item-WH reposts are queued:

1. If another repost with same item-wh but older posting date exists
    then skip current one.
2. If another repost with same item-wh but newer posting date exists
    then skip another one.
2021-11-25 16:37:19 +05:30
Ankush Menat
1d3842f03a fix: dont erase voucher_type and voucher_no for item_wh repost
kept for tracability.
2021-11-25 16:37:19 +05:30
Ankush Menat
a5a8c9104f perf: index for item-sh on repost item valuation
Item-WH based reposting requires querying existing similar repost.
Assuming there is only 1 max extra entry with same params just indexing
item-WH is sufficient to speed up the query.
2021-11-25 16:37:19 +05:30
Ankush Menat
45dd46be3d feat: option to select reposting method
In current implementation selecting Item-Warehouse based reposting is
better for few users, who don't use depenent SLEs but have frequent
transactions involving same items.

This change lets them switch to item-warehouse based reposting if
required.

Only use this if you understand technicalities of stock reposting. This
is experimental but will become mainstream in coming days.
2021-11-25 16:37:19 +05:30
Ankush Menat
d220e08ba4 refactor: reuse get_items_to_be_repost function 2021-11-25 16:37:19 +05:30
Ankush Menat
a36c249d3d test: item-wh repost creation 2021-11-25 16:37:19 +05:30
Ankush Menat
6dc9b822bc refactor: item-wh wise reposting by default 2021-11-25 16:37:19 +05:30
Deepesh Garg
5ba3b28d69 fix(refactor): Advance tds allocation to purchase invoice 2021-11-25 15:42:30 +05:30
Marica
ffdf32b5b3
Merge branch 'develop' into cost-of-poor-quality 2021-11-25 13:29:40 +05:30
marination
42395af22a fix: Remove commented code 2021-11-25 13:28:52 +05:30
marination
8c9779d69d fix: Dont auto set is finished item or is scrap itm checkbox for independent entry
- System cant differentiate between scrap and FG when WO is absent, so dont auto set
- User must set it manually
- `validate_finished_goods` checks this
2021-11-25 13:23:10 +05:30
marination
d6bc121999 fix: Validate Finished Goods for Independent Manufacture entries as well
- Check if FG exists even if WO is absent
- Check if multiple FGs are there, block.
2021-11-25 13:18:58 +05:30
GangaManoj
c9743185c6 fix: Remove unnecessary comma 2021-11-24 21:58:42 +05:30
GangaManoj
adfd519139 fix: Test Product Bundle price calculation when there are multiple Product Bundles 2021-11-24 21:58:05 +05:30
GangaManoj
325923afc7 fix: Test that indices are reset for Packed/Bundle Items when Product Bundles are removed from the Items table 2021-11-24 21:47:06 +05:30
GangaManoj
8370042f82 fix: Reset indices in the Packed/Bundle Items table on deleting Product Bundles 2021-11-24 21:06:23 +05:30
Saqib Ansari
c46c8dd6c5 feat: do not change variance if response or resolution is set 2021-11-24 19:23:31 +05:30
Jannat Patel
5b2ba24563 fix: company tour 2021-11-24 19:19:45 +05:30
Mohammed Yusuf Shaikh
8d2abc4b86
fix: fixes in work order doctype (#28217)
* fix: fixes in work order doctype

* fix: sider issues and disabled set only once property

* fix: set default qty to manufacture

* fix: dont manually collapse sections

* fix: remove unnecessary messages

* fix: make dependent fields read only

Co-authored-by: Ankush Menat <ankush@frappe.io>
2021-11-24 16:23:12 +05:30
Saqib Ansari
1f060c0b0a feat: find SLA based on customer group's ancestors 2021-11-24 14:00:18 +05:30
Saqib Ansari
9047e2b9dd refactor: do not set default priority in isssues 2021-11-24 13:52:20 +05:30
Saqib
136dd4f801
Merge branch 'develop' into product-bundle-fixes 2021-11-24 11:27:12 +05:30
Deepesh Garg
6ca5f228f8 Merge branch 'develop' of https://github.com/frappe/erpnext into advance_tds_allocation_gl 2021-11-24 10:45:02 +05:30
Ganga Manoj
6fd466a323
Merge branch 'develop' into fix-clear-depr-schedule 2021-11-24 06:10:14 +05:30
GangaManoj
0803f87660 fix: Fix Product Bundle price calculation when there are multiple Product Bundles 2021-11-24 06:07:58 +05:30
Ganga Manoj
068177d293
Merge branch 'develop' into serialized-item-consumption 2021-11-24 05:29:56 +05:30
Ganga Manoj
5ef709f569
Merge branch 'develop' into depr-expense-account 2021-11-24 05:26:40 +05:30
GangaManoj
4311936b7d fix: Edit dates and frequency of depreciation 2021-11-24 05:21:31 +05:30
GangaManoj
6ec5a19063 fix: Test if clear_depreciation_schedule() works for multiple finance books 2021-11-24 03:23:02 +05:30
GangaManoj
33a0b1db2c fix: Retain depreciation schedule rows that are linked with JEs while clearing the schedule 2021-11-24 03:16:17 +05:30
GangaManoj
f455de2924 fix: Test if multiple Depreciation Schedules are set up for multiple Finance Books 2021-11-23 23:26:32 +05:30
GangaManoj
60d82d913c fix: Test Depreciation Entry posting when Depreciation Expense Account is an Income Account 2021-11-23 23:07:27 +05:30
GangaManoj
a36713cd2d fix: Test Depreciation Entry posting when Depreciation Expense Account is an Expense Account 2021-11-23 21:03:03 +05:30
GangaManoj
d406775d1a fix: Check root_type of Depreciation Expense Account 2021-11-23 20:21:24 +05:30
Ankush Menat
ab2c1f62a1
fix: correct module for reloading doc (#28523) 2021-11-23 18:21:00 +05:30
mergify[bot]
34d1fec7de
fix: broken bom tree view and remove duplicate button (#28512) (#28527)
* fix: broken bom tree view and remove duplicate button

(cherry picked from commit 7ae1369d64ecaa829965d89915475fbd3211b5c2)

Co-authored-by: Bhavesh Maheshwari <34086262+bhavesh95863@users.noreply.github.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
2021-11-23 17:53:26 +05:30
Ankush Menat
0df9cf9526
chore: remove dead/irrelevant links from workspace (#28519)
* chore: remove dead link to shopify settings

* chore: unlink "debug" reports from stock dashboard
2021-11-23 15:08:51 +05:30
Deepesh Garg
0931d17a2a
Merge branch 'develop' into currency-exchange-settings 2021-11-23 12:39:25 +05:30
Ganga Manoj
5ef2330022
fix: Replace 'parent' with 'invoice_or_item' (#28513) 2021-11-23 12:28:41 +05:30
Subin Tom
1909bb569e
fix: POS Item cart only taxes with amount displayed (#28501) 2021-11-23 10:35:43 +05:30
Rucha Mahabal
5ba1bc1572
fix: Employee link formatter showing incorrect value for Employee Name (#28504) 2021-11-23 09:30:30 +05:30
GangaManoj
406278b5c1 fix: Add bundle items to PO only if the Product Bundle was selected from the SO 2021-11-23 04:51:53 +05:30
Ganga Manoj
2e01b40465
Merge branch 'develop' into fix-clear-depr-schedule 2021-11-23 02:41:04 +05:30
GangaManoj
475d8394e4 fix: Clear Depreciation Schedule entries that aren't linked with Journal Entries before modifying the schedule 2021-11-22 21:51:32 +05:30
Rucha Mahabal
e7eef9601d
fix(UX): Allocated Amount in Advances not updated on updating expense amount in Expense Claim (#28497)
* fix(UX): Allocated Amount in Advances not updated on updating expense amount in Expense Claim

* fix: Expense Claim Advance form labels
2021-11-22 20:13:15 +05:30
Deepesh Garg
056e3b199c
Merge pull request #28469 from nemesis189/new-company-setup-fy-query
fix: FY query returning None for new company
2021-11-22 19:23:07 +05:30
Rohit Waghchaure
db9bd5b912 feat: report to see the consumed materials against the work order 2021-11-22 18:01:20 +05:30
Deepesh Garg
e8370147e8
Merge pull request #28489 from deepeshgarg007/ksa_print_format
fix: KSA Invoice print format for multicurrency invoices
2021-11-22 16:34:34 +05:30
Deepesh Garg
73c56510d8 fix: Delete KSA vat setting on deleting company 2021-11-22 14:21:53 +05:30
Subin Tom
fce4f34325
fix: POS string translation (#28381) 2021-11-22 13:34:26 +05:30
Deepesh Garg
42c40b33bc fix: KSA Invoice print format for multicurrency invoices 2021-11-22 13:20:43 +05:30
Sagar Sharma
aa689874e3
fix: Closed status error in Work Order Summary (#28460)
* fix: Closed status error in Work Order Summary

* chore: use get_meta to get status options

* refactor: simplify code

Co-authored-by: Ankush Menat <ankush@frappe.io>
2021-11-22 13:06:59 +05:30
Anupam Kumar
b8ef8bcde9
Merge branch 'develop' into manufacturing-work-order-closed 2021-11-22 12:56:15 +05:30
Ankush Menat
c436e30ee6 fix: don't use cached doc while reposting 2021-11-22 12:40:18 +05:30
Ankush Menat
aa024fc9da fix: ignore permissions while creating repost
If user reached this code then they already have permission to create
stock transaction, hence ignore permission checks while
creating/cancelling repost item valuation entries.
2021-11-22 12:40:18 +05:30
Ankush Menat
42f1dd98dd fix: restrict repost valuation to manager roles 2021-11-22 12:40:18 +05:30
Ganga Manoj
7d0558e202
fix: Add extra column to display Invoice or Item when grouped by Invoice (#28380) 2021-11-22 12:34:46 +05:30
Saqib
cb52e6dd6b
fix: cost center wise ledger posting for pcv (#28477) 2021-11-22 12:24:32 +05:30
Saqib
78851ecb70
feat: create party link from customer/supplier (#28387)
* feat: create party link from customer/supplier

* test: create_party_link method
2021-11-22 12:23:23 +05:30
Saqib
7677d6d4c3
Merge pull request #28402 from GangaManoj/gross-profit-percentage
fix: Gross Profit report totals
2021-11-22 12:21:22 +05:30
Ahmed Shareef
3a2074ce05
fix: add child button in coa tree (#28413) 2021-11-22 11:46:58 +05:30
Ganga Manoj
624e58d1de
fix: Filter out cancelled and non-depreciable Assets in Asset Value Adjustment (#28443) 2021-11-22 11:36:35 +05:30
Deepesh Garg
8701f537bb
Merge pull request #28471 from nextchamp-saqib/fix-qrcode-generation-ksa
fix: bug with qrcode generation due to default print format name
2021-11-22 10:37:27 +05:30
Anupam Kumar
44303f93cc
Merge branch 'develop' into manufacturing-work-order-closed 2021-11-22 10:36:02 +05:30
Saqib
6e3a276a75
Merge branch 'develop' into new-company-setup-fy-query 2021-11-20 15:16:26 +05:30
Saqib
08ad93d82f
fix: coa balance rendering bug (#28468) 2021-11-20 15:15:46 +05:30
Saqib Ansari
ac27391a1f fix: bug with qrcode generation due to default print format name 2021-11-20 11:22:19 +05:30
Subin Tom
350ed1a6c2 fix: FY query returning None for new company 2021-11-19 21:05:25 +05:30
Mohammed Redah
9d319c2205
fix:Change QR Code Triggerr event
This fixes the bug if the user changes the date after insertion it will show the wrong values
2021-11-19 15:13:23 +03:00
Deepesh Garg
ff65399ae9 fix: Add test for gst category check
(cherry picked from commit cdbc991e3f97c7ed3e120b2e4720298402d1de77)
2021-11-19 06:51:58 +00:00
Deepesh Garg
a38aca5a54 fix(India): GST category not getting auto updated
(cherry picked from commit f8a26a9fac2c91b036f1dd4033f3fb4797285043)
2021-11-19 06:51:58 +00:00
Anupam
6210f10207 fix: linter issues 2021-11-19 10:32:04 +05:30
Anupam
6dda1548bc fix: linter issues 2021-11-19 10:22:50 +05:30
Anupam
6eb779392e feat: carry forward communication and comments throughout the sales cycle 2021-11-19 10:13:05 +05:30
Deepesh Garg
a57d39909e
Merge pull request #28302 from nemesis189/shipping-rule-updation-error
fix: Shipping Rule picking up old net_rate
2021-11-19 08:21:53 +05:30
GangaManoj
059d1f3b74 fix: Rename loop variable 2021-11-19 05:35:41 +05:30
GangaManoj
a4043c035d fix: Prevent clearing of Depreciation Schedule on adding more than one Finance Book 2021-11-19 05:27:06 +05:30
Ankush Menat
f8e371af14 fix(ux): ordering fields for better tab order 2021-11-18 15:48:15 +05:30
Sagar Sharma
488d34af1f
fix: unchecking the "With Operations" in BOM clears operations table #28446 2021-11-18 13:57:13 +05:30
Ganga Manoj
5d8a85db10
Merge branch 'develop' into gross-profit-percentage 2021-11-17 19:23:34 +05:30
Ganga Manoj
6ada1ac887
Merge branch 'develop' into depr-expense-account 2021-11-17 18:56:02 +05:30
Marica
d0c240ee84
Merge pull request #28431 from marination/capacity-dashboard-style
fix: (style) Warehouse Capacity Dashboard UI
2021-11-17 18:04:26 +05:30
Ankush Menat
8102e4a210
chore: remove manual collapsing of section (#28435) 2021-11-17 17:05:07 +05:30
Ankush Menat
402205278c chore: remove support email from error message.
[skip ci]
2021-11-17 16:33:18 +05:30
marination
23486a929d fix: (style) Warehouse Capacity Dashboard UI
- Made refresh button icon visible
- Edit Capacity button size and alignment
- Medium font on dashboard
2021-11-17 14:21:37 +05:30
rohitwaghchaure
b9c8489de6
Merge pull request #28417 from rohitwaghchaure/currency-wise-pricing-rule-not-working
fix: currency wise pricing rule not working
2021-11-17 14:02:19 +05:30
Rohit Waghchaure
43aeb541c2 fix: currency wise pricing rule not working 2021-11-17 13:30:17 +05:30
rohitwaghchaure
69421a30d7
Merge pull request #28425 from rohitwaghchaure/improve-performance-to-submit-jv-and-invoice
fix: performance issue while submitting the Journal Entry
2021-11-17 12:54:59 +05:30
Rohit Waghchaure
7472760ea3 fix: performance to submit the JV 2021-11-17 11:16:52 +05:30
Anupam Kumar
98308ea089
Merge branch 'develop' into manufacturing-work-order-closed 2021-11-17 10:07:35 +05:30
GangaManoj
cb93cc972d fix: Check all ancestors and not just the root node 2021-11-17 05:22:43 +05:30
GangaManoj
62fbbe8915 fix: Only raise an error if Depreciation Expense Account is neither an Income nor an Expense Account 2021-11-17 04:59:59 +05:30
GangaManoj
8fc31e3cea fix: Make Depreciation Entry posting more flexible 2021-11-17 04:58:13 +05:30
GangaManoj
aa34780265 fix: Filter Depreciation Expense Account by root type 2021-11-17 04:57:40 +05:30
Subin Tom
e7b4204c35 fix: sider issues 2021-11-16 20:39:58 +05:30
Sagar Vora
c00d0a3e24
fix: better validation for Integration Request (#28186) 2021-11-16 20:31:18 +05:30
Anupam Kumar
37aa2cb271
Merge branch 'develop' into manufacturing-work-order-closed 2021-11-16 19:35:20 +05:30
marination
c192c135d4 Merge branch 'develop' of https://github.com/frappe/erpnext into cost-of-poor-quality 2021-11-16 19:15:47 +05:30
Subin Tom
a8e2c02e14 fix: fixed tests, separated a method for shipping charges 2021-11-16 19:06:49 +05:30
Marica
612bb5c749
Merge branch 'develop' into se-required-items-from-jc 2021-11-16 18:03:40 +05:30
Marica
6bd0c1dbf1
Merge pull request #28269 from marination/pr-return-ux
refactor:  (ux) Accepted/Rejected/Received Qty UX
2021-11-16 18:00:42 +05:30
Subin Tom
a1807a2f98
fix: POS idx issue in taxes table while merging (#28389) 2021-11-16 17:46:26 +05:30
Saqib
5f30104e00
Merge branch 'develop' into gross-profit-percentage 2021-11-16 16:00:07 +05:30
Saqib
950261d860
Merge branch 'develop' into serialized-item-consumption 2021-11-16 15:59:53 +05:30
Marica
4afcbfdc08
Merge branch 'develop' into pr-return-ux 2021-11-16 15:15:48 +05:30
marination
a5f8274d79 fix: test_job_card_partial_material_transfer test
- Use a specific BOM for JC tests
- Utility to create said BOM
- Sider: unused variable
2021-11-16 15:13:19 +05:30
marination
293f6cbafd fix: Sider, Linter and Server Side Test
- Fix Server side PR test
- linter: re-arrange imports
- sider: avoid single line multi statement
- Code cleanup: Improve code readability and avoid horizontal scroll in test_purchase_receipt
- Removed unused variables in test_purchase_receipt
2021-11-16 14:36:15 +05:30
Ahmed Shareef
952fc87c99
refactor: fix help section background in dark mode (#28406) 2021-11-16 14:30:13 +05:30
marination
e9c75d6eea test: Purchase Invoice Received Qty 2021-11-16 11:55:34 +05:30
Rohit Waghchaure
d82910b08a fix: Pricing Rule not created against the Promotional Scheme 2021-11-16 10:27:59 +05:30
Ankush Menat
ed99aca36f test: basic test for serialize reco cancel 2021-11-16 10:00:18 +05:30
Ankush Menat
8c85012a70 fix: can not cancel stock reconciliation with sr no 2021-11-16 10:00:18 +05:30
GangaManoj
1affa12b74 fix: Replace 'Totals' with 'Total' 2021-11-16 03:36:47 +05:30
GangaManoj
508a2301ee fix: Display totals row in bold 2021-11-16 03:22:04 +05:30
GangaManoj
c7ffe3a7b4 fix: Remove unnecessary condition 2021-11-16 02:36:58 +05:30
GangaManoj
582a7ae964 fix: Add totals row when Grouped By Invoice 2021-11-16 02:33:51 +05:30
GangaManoj
3aaf7cb408 fix: Remove default Totals row 2021-11-16 02:33:12 +05:30
Deepesh Garg
74ccaeb07d
Merge branch 'develop' into shipping-rule-updation-error 2021-11-15 20:34:05 +05:30
Rohan
043e3255d6
fix: remove item-item group name validation (#28392) 2021-11-15 19:41:17 +05:30
Deepesh Garg
ce06aaa0ae
Merge pull request #27735 from GangaManoj/fix-so-cancellation-message
fix: Sales Order cancellation message
2021-11-15 18:51:30 +05:30
Ankush Menat
54184e54ed fix: patch for naming series property setter 2021-11-15 18:18:22 +05:30
Ankush Menat
7fcaeca403 fix: don't make naming series mandatory for items
Item variants are an exception, hence this needs to be checked
conditionally.
2021-11-15 18:18:22 +05:30
marination
05ec7cce82 test: Purchase Receipt Received Qty 2021-11-15 17:49:14 +05:30
marination
afe1c45f7f fix: Sider + Fields UX
- remove extra space (sider)
- PR: Bring rejected qty in grid view
- PI: Rename `Stock Qty` to `Accepted Qty in Stock UOM`
- PI: Move `Accepted Qty in Stock UOM` under Stock UOM
2021-11-15 17:17:29 +05:30
Sagar Sharma
2eccb7a1ca
fix: Work order creation from sales order (#28388)
* fix: Work order creation from sales order

* chore: formatting

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
2021-11-15 16:08:15 +05:30
marination
bb561ba7a8 fix: Server side test
- make `tests_that_skip_setup` a tuple (added comma)
- remove manual teardown in `test_job_card_material_transfer_correctness` to avoid premature committing
- transfer_material_against = "Job Card" while making BOM with mulitple operations
2021-11-15 15:21:20 +05:30
Deepesh Garg
c572a4cb88 fix: Book unaccrued interest check 2021-11-15 09:28:56 +05:30
Deepesh Garg
91c8d457b0 Merge branch 'develop' of https://github.com/frappe/erpnext into term_loan_enhancement 2021-11-15 09:28:03 +05:30
Deepesh Garg
ccbb8c82b3
Merge branch 'develop' into fix-hsn_wise 2021-11-14 10:37:36 +05:30
Smit Vora
520f33b02f fix(regional): hsn_wise as false returns item_code 2021-11-14 08:10:53 +05:30
Dany Robert
3f8ad54c5c
Merge branch 'develop' into currency-exchange-settings 2021-11-13 13:13:15 +05:30
Dany Robert
e50893e991
fix: eslint brace style issue 2021-11-13 13:12:38 +05:30
Ankush Menat
c0f06bc8e3
fix: validate hmac unconditionally (#28372) 2021-11-12 14:45:51 +05:30
Sagar Vora
6d3e9bce5f
fix(M-Pesa): validate type before executing get_doc (#28369) 2021-11-12 14:24:33 +05:30
Sagar Vora
24b048925b
fix(WooCommerce): always expect signature in webhook requests (#28367) 2021-11-12 14:08:02 +05:30
Sagar Sharma
a424310581
fix: Collapse Scrap Items in Job Card (#28362) 2021-11-12 13:50:30 +05:30
Deepesh Garg
829f92f10a
Merge pull request #28363 from deepeshgarg007/default_party_account
fix: Default party account getting overriden in invoices
2021-11-12 13:04:21 +05:30
Deepesh Garg
88648570d7 fix: Default party account getting overriden in invoices 2021-11-12 12:39:30 +05:30
Sagar Sharma
944bf8da71
fix: Unable to edit supplier scorecard criteria name once created (#28348) 2021-11-11 19:49:41 +05:30
rohitwaghchaure
0157da57b5
Merge pull request #28308 from rohitwaghchaure/commision-rate-not-fetch-from-sales-person
fix: commission rate not fetch from sales person
2021-11-11 19:11:31 +05:30
GangaManoj
1393f97ad5 fix: Add serial no to Stock Entry doc to decrease quantity for Stock Items consumed during repair 2021-11-11 18:48:23 +05:30
GangaManoj
4668bb4be0 feat: Add 'Add Serial No' button in the Stock Items table 2021-11-11 18:42:25 +05:30
GangaManoj
abb535540a fix: Rename item to item_code 2021-11-11 18:41:16 +05:30
GangaManoj
1aed8c4b2f feat: Add Serial No field 2021-11-11 18:40:38 +05:30
Saqib
ecbe4b16b8
perf(minor): general ledger report (#27987) 2021-11-11 13:55:21 +05:30
Marica
18f9e3558e
Merge branch 'develop' into se-required-items-from-jc 2021-11-11 11:14:37 +05:30
Deepesh Garg
0dca97eb9f fix(India): Sales Invoice with duplicate items not showing correct taxable value 2021-11-10 21:07:48 +05:30
Ankush Menat
c96b5492db fix: reload doctype forcefully 2021-11-10 19:41:55 +05:30
Subin Tom
af1fce0419 fix: check if shipping rule value exists 2021-11-10 16:49:12 +05:30
Subin Tom
18ae03d967 fix: calling shipping rule method during net_total calculation in taxes_adn_totals.py 2021-11-10 15:57:41 +05:30
Anupam Kumar
3d012ad31d
Merge branch 'develop' into manufacturing-work-order-closed 2021-11-10 14:55:53 +05:30
Anupam
1a7851b1ad fix: error message 2021-11-10 14:55:13 +05:30
Saqib
6d05bb5274
fix(pos): get mode of payments query (#28321) 2021-11-10 13:06:55 +05:30
Ankush Menat
12e81df2b7 fix: default value for allow neg stock in repost_item_valuation
Negative stock can be toggled back after queuing transactions, this
causes failure when repost is executed.

Now allow_negative_stock stock is set at time of queuing the repost job.
This means setting changes done afterwards won't affect already
submitted reposts.
2021-11-10 13:05:14 +05:30
Anuja Pawar
2f004693c3
fix(Bank Reconciliation): get credit amount for bank account of type liability 2021-11-10 12:36:54 +05:30
Ankush Menat
e498389b00 fix: ignore cancelled entries in incorrect balance qty report 2021-11-10 12:09:51 +05:30
Anupam
68dc42fb1f fix: function name [is_work_order_stopped -> is_work_order_closed] 2021-11-10 10:12:29 +05:30
Rohit Waghchaure
4d4bfa2333 fix: commision rate not fetch from sales person 2021-11-10 00:00:38 +05:30
marination
1eb3ca2b86 fix: (travis) Production Plan Summary Report breaks if no WO
- `get_cached_value` throws a DoesNotExistError if non-existent value, used `get_value` instead
- accomodate production plan items that dont have WO/PO against them as well (blank values)
- added some None value handling to avoid AttributeError
2021-11-09 23:07:28 +05:30
Anupam Kumar
6954dd6329
feat: Competitor Tagging in Opportunity and Quotation (#28050)
* feat: Competitor Tagging in Opportunity and Quotation

* fix: review changes

* fix: linter issue

* fix: section label

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-11-09 19:36:27 +05:30
Ankush Menat
ccf84ae88a fix: patch to update job card status 2021-11-09 18:04:50 +05:30
Ankush Menat
fdfa39c231 fix: avoid mutating iterator while iterating over it 2021-11-09 18:04:50 +05:30
Ankush Menat
37799fe3dd fix: use completion qty instead of transfer quantity for JC status 2021-11-09 18:04:50 +05:30
Marica
031178224f
Merge branch 'develop' into se-required-items-from-jc 2021-11-09 17:33:20 +05:30
Wolfram Schmidt
6907ad8adb
fix: add Email option to contact email field (#28296)
* Update warranty_claim.json

Added the Email in option field of Contact Email so you are able to create a notification mapping to this field as reciever.

* Update warranty_claim.json
2021-11-09 17:32:57 +05:30
marination
e8d0c25dff fix: Partial Trabsfers against JC
- Fixed transferred qty not back updating on JC if partial transfer
- Partial transfer not mapping pending qty from JC correctly in SE
- tests for above cases
- minor code cleanup
2021-11-09 17:29:29 +05:30
Deepesh Garg
20bc613b81
Merge pull request #28294 from ruchamahabal/fix-hr-patch-breaking
fix(India setup): setup company independent fixtures for patch
2021-11-09 17:27:13 +05:30
Deepesh Garg
8a253ed1f3
Merge pull request #28238 from nextchamp-saqib/perf-financial-statements
perf: improve financial statement loading time
2021-11-09 16:29:58 +05:30
Rucha Mahabal
88b5bda34b fix(India setup): setup company independent fixtures for patch 2021-11-09 16:04:52 +05:30
Sagar Vora
da22744e0f
fix: specify fields to be set in Lead (#28288) 2021-11-09 15:49:32 +05:30
rohitwaghchaure
f57538bd2a
Merge pull request #28150 from anupamvs/manufacturing-work-order-stop
feat: provision to close the Work Order
2021-11-09 15:45:53 +05:30
Jannat Patel
17acb08545
fix: sum of components in salary register (#28237)
* fix: sum of components in salary register

* fix: sum of deduction components

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-11-09 15:21:51 +05:30
Subin Tom
c78b8b7897 fix: Shipping Rule picking up old net_rate 2021-11-09 14:46:45 +05:30
Saqib
4a3cef6436
fix: update 'current_invoice_end' after processing invoice (#28278) 2021-11-09 14:16:38 +05:30
Ankush Menat
34f5283c17
fix: show full item name in search widget (#28283) 2021-11-09 11:55:33 +05:30
Anupam Kumar
092936d8ba
Merge branch 'develop' into manufacturing-work-order-stop 2021-11-09 10:51:09 +05:30
Anupam
663a7afe4d fix: get_planned_qty chnages 2021-11-09 10:50:38 +05:30
Bibin
0e8e7e21c3
fix: filter only submitted fees in student fee collection report (#28280)
* Update student_fee_collection.json

Fix: filter and show only submitted fees documents

* fix: add total row for the student fee collection
2021-11-09 10:02:05 +05:30
Anupam
27709a1c71 fix: test cases 2021-11-09 09:56:58 +05:30
Deepesh Garg
94d70bca9e
fix: Resolve conflicts 2021-11-08 18:48:46 +05:30
Subin Tom
45fd819729 fix: company condition fix, added company field
(cherry picked from commit 7ad2717accea61883f98d418b4abed47ca3937a8)
2021-11-08 13:12:28 +00:00
Subin Tom
d2915c6bc7 fix: fixed company field, updated patch
(cherry picked from commit 7f2d304f32fdf580a354c1dbba58189cdd4f35f2)

# Conflicts:
#	erpnext/patches.txt
2021-11-08 13:12:27 +00:00
Subin Tom
e51c4ba8a9 fix: Added company field, filtered account heads
(cherry picked from commit 902c03cd375c7b1b2f35cff4dfbc5f1ff3e4cd56)
2021-11-08 13:12:25 +00:00
Subin Tom
75e9100a53 fix: Fixed customer address variable, sales invoice item field currency issue
(cherry picked from commit 904010ab645fdb16f09072c062269945f7747712)
2021-11-08 13:12:25 +00:00
Deepesh Garg
2bf3b0fcac
Merge pull request #28272 from deepeshgarg007/ksa_vat_fixes
fix: KSA VAT setup issues
2021-11-08 18:08:49 +05:30
Deepesh Garg
0950459b0f
Merge pull request #28065 from Anuja-pawar/gst-category
fix(minor): check if gst_category exists while validating GSTIN
2021-11-08 17:53:10 +05:30
Deepesh Garg
07e7b92383
Merge pull request #28185 from vorasmit/ewaybill-fix
fix(regional): incorrect `totalValue` in ewaybill JSON
2021-11-08 17:52:07 +05:30
Deepesh Garg
508832e90a fix: Add patch to make custom fields 2021-11-08 17:46:24 +05:30
Deepesh Garg
c81d4734c4 fix: KSA VAT setup issues 2021-11-08 17:14:03 +05:30
Deepesh Garg
419e03954c
Merge pull request #28166 from Havenir/ksa-vat
feat(Print Format): KSA VAT Invoice
2021-11-08 15:27:02 +05:30
marination
5fb5a757cf refactor: (ux) Accepted/Rejected/Received Qty UX 2021-11-08 13:23:42 +05:30
ahmadpak
8df50cf1e0 update(Print Format): Sales Invoice
- KSA VAT Invoice
Customer Identification Number Added
2021-11-08 09:29:33 +03:00
Ankush Menat
db3193dcab
chore: remove migration_hash (#28263) 2021-11-08 10:57:20 +05:30
mergify[bot]
c0b889b94d
fix: auto update price list rate (#28255) (#28256)
* fix: auto update price list rate

* fix: hide field when auto insert isn't enabled

(cherry picked from commit bb3957eba35a5204a1a01e412dee596532bd525e)

Co-authored-by: Sagar Sharma <63660334+s-aga-r@users.noreply.github.com>

[skip ci]
2021-11-07 17:42:51 +05:30
Dany Robert
01e7076b65
Merge branch 'develop' into currency-exchange-settings 2021-11-06 09:59:00 +05:30
Ankush Menat
8fe5feb6a4 chore: remove all six compat code 2021-11-05 11:16:29 +05:30
Ankush Menat
897e90ac55 chore: remove past module dependencies 2021-11-05 11:16:29 +05:30
Ankush Menat
6098e92ba9 chore: remove utf-8 compat code 2021-11-05 11:16:29 +05:30
mergify[bot]
25f647f067
fix: Bulk update of valid upto field wasn't working (bp #28242)
* fix: Bulk update of valid upto field wasn't working

Check in dates for the price list was failing because valid_upto field was string. Converting to date fixed the problem.

* chore: extend fix and cleanup whitespace

Co-authored-by: Ankush Menat <ankush@frappe.io>
(cherry picked from commit 95a5ef1d416d54ecf0f557586b341b0dce2a0b05)

Co-authored-by: fatihustaoglu <46131068+fatihustaoglu@users.noreply.github.com>
2021-11-04 21:46:48 +05:30
Raffael Meyer
114028e473
feat: replace newline in remarks (DATEV report) (#28152) 2021-11-04 21:44:24 +05:30
marination
0aa237f38c test: Stock Entry from JC correctness (items mapping and qty) 2021-11-04 20:14:28 +05:30
Marica
51fb543f67
Merge branch 'develop' into se-required-items-from-jc 2021-11-08 18:05:11 +05:30
Dany Robert
4716523c77 fix: sider issues 2021-11-04 05:38:00 +00:00
Dany Robert
4a0f2175ad fix: pre-commit issues 2021-11-04 05:25:48 +00:00
Dany Robert
1f8be84985 fix : remove mutable data structures from argument defaults 2021-11-04 05:12:09 +00:00
Dany Robert
e65a76b214 chore: clean up 2021-11-04 05:04:10 +00:00
Dany Robert
08b2735a79 fix: make fields editable only when service provider is custom 2021-11-04 05:01:37 +00:00
Dany Robert
7291d9f236 feat: option for preconfigured selectable service providers 2021-11-03 14:13:22 +00:00
Saqib Ansari
b7a44fe0a3 perf: improve financial statement loading time 2021-11-03 18:17:31 +05:30
Dany Robert
d869b3933b
Merge branch 'frappe:develop' into currency-exchange-settings 2021-11-03 18:15:27 +05:30
Anupam
7044ae5e39 fix: testcases: 2021-11-03 17:41:04 +05:30
Noah Jacob
cb064b06ad
fix: added job_card_item link in material request (#28222)
* fix: added job_card_item links in material request

* fix: add no copy to row references
2021-11-03 11:53:57 +00:00
marination
3da03028f3 fix: Pull Items that are in JC in Stock Entry against JC
- Check if items pulled in stock entry are present in Job Card
- Code cleanup and removed redundant checks

Co-authored-by: Gavin D'souza <gavin18d@gmail.com>
2021-11-03 17:05:57 +05:30
Anuja Pawar
0d65a6e333
Merge branch 'develop' into gst-category 2021-11-03 15:49:22 +05:30
Anupam
cc15cf6ae2 fix: linter isuue 2021-11-03 13:54:46 +05:30
Anupam Kumar
8ebc412e8b
Merge branch 'develop' into manufacturing-work-order-stop 2021-11-03 13:41:37 +05:30
Anupam
ba47bd02b6 fix: sider isuue 2021-11-03 13:41:22 +05:30
Anupam
9b4c7e4796 fix: validate job card 2021-11-03 13:27:50 +05:30
Saqib
a5902fa3f8
Merge pull request #28187 from hrwX/subscription_active_fixes
fix: do not generate multiple invoices
2021-11-03 11:40:39 +05:30
Anuja Pawar
3c4484fbf9
Merge branch 'develop' into gst-category 2021-11-02 23:30:16 +05:30
Anuja Pawar
f2fbcc8124 fix: sider 2021-11-02 23:29:06 +05:30
Anupam
9c0906f1b5 fix: test cases 2021-11-02 20:43:00 +05:30
Deepesh Garg
11e90cc0be
Merge pull request #28205 from deepeshgarg007/lower_deduction_validation_fix
fix: Error on LDC creation
2021-11-02 20:27:18 +05:30
Deepesh Garg
66348e1a03 fix: Error on LDC creation 2021-11-02 20:26:40 +05:30
Marica
91112c49e1
Merge pull request #28202 from marination/serial-no-popup-with-scanner
fix: Serial Nos not set in the row after scanning in popup
2021-11-02 20:17:48 +05:30
hrwx
2bce193b81 Merge branch 'develop' of https://github.com/frappe/erpnext into subscription_active_fixes 2021-11-02 14:05:10 +00:00
Saqib
ec0a72423a
fix: Calculate depreciation_amount accurately (#27585) 2021-11-02 18:45:03 +05:30
marination
734b57deec fix: Serial Nos not set in the row after scanning in popup
- Avoid whitspaces while calculating length of serial nos
2021-11-02 18:34:55 +05:30
Noah Jacob
857d87da97
fix: replaced "=" with "in" for multiple statuses in query #28193
fix: replaced "=" with "in" for multiple statuses in query
2021-11-02 17:52:45 +05:30
Saqib
7681600b5e
fix: test wdv method for indian region 2021-11-02 17:47:44 +05:30
hrwx
890a786858 fix: do not generate multiple invoices 2021-11-02 11:58:01 +00:00
GangaManoj
f047c6ffc8 fix: Test for WDV 2021-11-02 16:43:31 +05:30
Anuja Pawar
d72709dd81
fix(Payment Entry): splitting outstanding rows as per payment terms (#27946) 2021-11-02 16:28:46 +05:30
marination
48886ee705 chore: Add comment above fix for future reference 2021-11-02 15:57:41 +05:30
marination
048210a8f6 fix: Remove warehouse filter on Batch field for Material Receipt 2021-11-02 15:49:58 +05:30