Ankush Menat
55b24345a0
fix: remove unused format from query
...
doctype is not used in query and parent alone is enough to identify
packed items.
2021-09-01 15:33:37 +05:30
Ankush Menat
7d9819f352
fix: remove duplicate imports
2021-09-01 15:33:35 +05:30
GangaManoj
4d8f833cc9
fix: Remove Add Row and Delete Row options for Packed Items table
2021-09-01 15:20:40 +05:30
GangaManoj
17a6a9b036
fix: Uncheck read-only for Packed Items table
2021-09-01 15:13:29 +05:30
GangaManoj
816ba55b74
fix: Make Rate read-only by default
2021-09-01 15:11:08 +05:30
Ankush Menat
2d62c500c4
fix: undefined variables
2021-09-01 15:05:00 +05:30
Ankush Menat
9fec0a5c68
refactor: itemgetter instead of assigned lambda
2021-09-01 15:02:29 +05:30
Ankush Menat
010060d92e
chore: correct indentation
2021-09-01 15:02:29 +05:30
Ankush Menat
694ae81618
fix: remove bare excepts
2021-09-01 15:02:28 +05:30
Alan
9dc0843cbd
fix: translate labels ( #27282 )
...
[skip ci]
2021-09-01 12:58:34 +05:30
Deepesh Garg
8b644d8889
fix: Report and JSON generation for Advances received
2021-09-01 10:28:15 +05:30
Deepesh Garg
5e22405c45
feat: CDNR Unreg json generation
2021-09-01 10:26:55 +05:30
Deepesh Garg
b6d0b17ed6
fix: Linting and patch fixes
2021-09-01 10:11:18 +05:30
Deepesh Garg
d06221ad7a
fix: Advance TDS test case
2021-09-01 10:05:10 +05:30
GangaManoj
0e457265b7
fix: Test Product Bundle price calculation
2021-09-01 02:50:29 +05:30
GangaManoj
0c3d3bb357
fix: Test if Product Bundles are mapped properly on creating a Sales Order
2021-09-01 02:33:53 +05:30
GangaManoj
912bfb234f
fix: Test if Product Bundles in SOs are replaced with their child items on creating POs
2021-09-01 02:09:46 +05:30
Ganga Manoj
82118975e2
Merge branch 'develop' into gross-profit-product-bundle
2021-08-31 22:08:10 +05:30
Rucha Mahabal
ef76f62bc1
fix: Healthcare Service Unit fixes ( #27273 )
...
* fix: validate service unit setup against practitioner schedule
* fix: service unit properties getting overwritten
2021-08-31 21:06:53 +05:30
GangaManoj
65796853f3
fix: Map Packed Items to Items table of PO
2021-08-31 20:31:22 +05:30
Ankush Menat
c1d986a0c6
fix: revert "refactor: simplify initialize_previous_data" ( #27270 )
...
This reverts commit 2f5624e588541103adb4a3170f2886590dcee42e.
2021-08-31 19:43:42 +05:30
Afshan
763450dcf8
Revert "fix: add child item groups into the filters ( #26997 )" ( #27266 )
...
This reverts commit c60d5523bc
.
2021-08-31 19:07:20 +05:30
Frappe PR Bot
81fb493850
fix: payment terms on Sales Order when Invoice Portion field is empty ( #27259 )
2021-08-31 19:01:03 +05:30
Anuja Pawar
3e404f15ff
refactor: payment reconciliation tool ( #27128 )
2021-08-31 18:59:29 +05:30
Deepesh Garg
c37cec9b9d
fix(minor): Incorrect unallocated amount on type receive ( #27262 )
2021-08-31 18:50:23 +05:30
GangaManoj
eb24e87637
fix: Replace Product Bundles in the Items table with their child items
2021-08-31 18:44:29 +05:30
Frappe PR Bot
6281c33dd4
fix: pos payment methods not setting rounded_total ( #27260 )
2021-08-31 18:39:51 +05:30
Subin Tom
7004944cc0
feat: Taxjar Integration update ( #27143 )
...
* feat: Taxjar Integration update
* added taxable_amount,taxable_amount fields in setup.py
* Update taxjar_integration.py
Sider issues fix
* Sider issues fix
* Sider issues fix
* sider issue fix: unused import
* sider issue fix
* Update erpnext/erpnext_integrations/taxjar_integration.py
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
* Removed permission for 'All'
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2021-08-31 18:33:16 +05:30
Deepesh Garg
5e10e10329
feat: Validity dates in Tax Withholding Rates
2021-08-31 18:23:28 +05:30
Anurag Mishra
ab47409e91
feat: Full and Final Settlement and Gratuity Fix ( #26364 )
...
* feat: Full and Final Settlement
* removed option to pay via salary slip
* feat: Create JV
* test:fnf
* fix: tracking asset movement
* fix: sider and test
* fix: changes Requested
* fix: changes requested
* fix: valication for Asset
* fix: add filter for reference document only if relevant field is present
* fix: doctype cleanup
- add more fields to the list view and standard filter
- set title field
- incorrect field labels
* feat: add list view settings for FNF
* fix: incorrect reference type set in Journal Entry
* fix: validation message
* chore: add Full and Final Statement link to Workspace
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-08-31 17:59:26 +05:30
Jannat Patel
48f2e5ac1d
fix: email digest original_user issue ( #27191 )
2021-08-31 17:43:30 +05:30
Frappe PR Bot
e958ae9002
feat: color and leave type in leave application calendar ( #27246 ) ( #27255 )
...
* feat: color and leave type in leave application calendar
* fix: sider + use cstring
(cherry picked from commit 366eb86fdfd9bb204bce677b01b8d5bb5ffa4d6d)
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
2021-08-31 17:34:48 +05:30
Dany Robert
94dcbf851a
fix: update get_exchange_rate for test mode ( #26847 )
...
* fix: no api calls on test mode
* fix: make api call, but return 1.0 incase of invalid currency
* feat: patch request.get
* fix: clear cache after test
* fix: add missing test_exchange_value
* fix: avoid api call in implicit function call during test
* fix: returning 1 while in test causes failure
Returning 1.00 causes failure of exchange rate tests.
* chore: retab
* chore: style
2021-08-31 17:19:12 +05:30
Alan
88aa7b824e
fix: pass labels through translation function ( #27252 )
2021-08-31 15:16:04 +05:30
Chillar Anand
88d849320f
fix(payroll): Fixed issue with accessing last salary slip for new employee ( #27247 )
2021-08-31 14:42:21 +05:30
GangaManoj
a067d55865
fix: Add Product Bundle field in Items table
2021-08-30 20:07:06 +05:30
GangaManoj
055ac82b39
fix: Remove Bundle Items table
2021-08-30 20:04:24 +05:30
Rucha Mahabal
1682402a9f
refactor: Healthcare Redesign Changes ( #27236 )
2021-08-30 18:26:56 +05:30
Dany Robert
5fd04101d4
fix: Stock Ageing report issues for serialized items ( #27228 )
...
* fix: incorrect calculation in get_range_age
* fix: remove serial numbers not in stock from fifo_queue
* refactor: make serial_no condition explicit
* refactor: reduce code duplication
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-08-30 18:11:33 +05:30
Deepesh Garg
fd467e6d32
fix: Correct company address not getting copied from Purchase Order to Invoice ( #27217 )
...
* fix: Correct company adderess not getting copied from Purchase Order to Invoice
* fix: Linting issues
2021-08-30 17:53:59 +05:30
Ankush Menat
7d2a0fe38e
Merge pull request #27197 from marination/supplier-primary-address
...
feat: (consistency) Add Primary Address and Contact section in Supplier
2021-08-30 14:03:09 +05:30
Subin Tom
9cb642238f
fix: expense claim reimbursed amount update ( #27204 )
2021-08-30 13:17:22 +05:30
Rucha Mahabal
212eb4bc1a
feat(Healthcare): Capacity for Service Unit, concurrent appointments based on capacity, Patient Appointments ( #27219 )
...
* feat(Healthcare): Capacity for Service Unit, concurrent appointments based on Capacity, Patient enhancements
* fix: appointment test
Co-authored-by: Anoop <3326959+akurungadam@users.noreply.github.com>
2021-08-30 13:10:18 +05:30
Marica
fbcf82f788
Merge branch 'develop' into supplier-primary-address
2021-08-30 12:51:37 +05:30
marination
7b78473da3
fix: Indentation and removed f-strings
...
- Sider: fixed indentation in js
- Dont use f-strings in queries
2021-08-30 12:50:24 +05:30
Deepesh Garg
f5cdbf161d
fix: LTV ratio comparison ( #27207 )
2021-08-28 14:55:51 +05:30
François de Ryckel
327071cb90
replace cur_frm with frm ( #27210 )
2021-08-28 14:55:11 +05:30
GangaManoj
e44567754d
fix: Display Packed/Bundle Items table only if it exists
2021-08-27 20:16:13 +05:30
GangaManoj
a2b394b195
fix: Enable Print Hide for Bundle Items
2021-08-27 20:06:22 +05:30
GangaManoj
a7be02fe32
fix: Only add Item to packed_items list if it's not already there
2021-08-27 20:02:36 +05:30
Devin Slauenwhite
072151e16d
feat: Payment reconciliation on accounts module workspace ( #25925 )
...
* feat: add payment reconciliation to accounting workspace
* fix: update modified and duplicate the link
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-08-27 19:44:57 +05:30
marination
2a3ef03388
fix: Popup stale build and data consistency
...
- Include `supplier_quick_entry.js` in erpnext.bundle.js
- Create primary supplier address on update
- Set newly created address (quick entry) in Supplier and Customer
- Clear address set in supplier and customer on delete (dependency)
2021-08-27 18:06:51 +05:30
Shadrak Gurupnor
7433757489
fix: patches were breaking during migration ( #27200 )
...
* fix: patches were breaking during migrating
* fix: patches were breaking during migration
2021-08-27 18:00:16 +05:30
Rucha Mahabal
5f3ec8230f
Merge pull request #27102 from anupamvs/prospect
...
feat(CRM): Prospect to group Leads
2021-08-27 16:48:41 +05:30
Shadrak Gurupnor
17e0fa7a8b
fix: patches were breaking while migrating ( #27195 )
...
* fix: patches were breaking while migrating
* fix: Removed duplicate function
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-08-27 16:42:25 +05:30
Rucha Mahabal
e170ad2df3
chore: add more fields to Prospect list view
2021-08-27 16:26:12 +05:30
Anupam Kumar
212921aace
Merge branch 'develop' into prospect
2021-08-27 15:57:10 +05:30
marination
bf72ec0598
feat: (consistency) Add Primary Address and Contact section in Supplier
...
- The same is present in customer and is inconsistent with supplier
- Helps quickly create primary address and contact via quick entry
2021-08-27 15:51:31 +05:30
Kamal Johnson
a285b5b78b
feat: Accounts, Selling & Assets Onboarding cleanup ( #27112 )
...
* refactor: company form fields arrangement
* refactor: accounts onboarding steps
* refactor: re-arrange fields & modify labels in company form
* feat: onbording steps for accounts module
* fix: updated onboarding steps for selling module
* fix: remove unwanted steps from accounts
* feat: add more onboarding steps
* feat: Refactor onboarding-module for accounting workspace
* feat: Add basic asset onboarding steps
* feat: Add basic asset item form tour
* feat: Add basic selling onboarding-steps
* feat: Add basic form tour for purchase recipt
* feat: Add basic form tour for existing asset
* feat: Adding asset category form tour
* feat: Add form tour for asset category
* feat: Refactor sales taxes and charges template form tour with new method
* refactor: Remove old form tour for accounts settings
* refactor: Change asset category form tour with new tour method
* refactor: Change asset item form tour with new tour method
* refactor: Change purchase receipt form tour with new tour method
* refactor: Change asset form tour with new tour method
* refactor: Remove old form tour for selling settings
* refactor: general fix/typo in onboarding steps
* Apply suggestions from code review
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
* refactor: Remove old form tour method for sales order.
* fix: removed duplicate section break
* fix: Removed duplicate fields
Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
Co-authored-by: Anuja <anuja.pawar20@gmail.com>
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-08-27 15:47:11 +05:30
Saqib
08188f2ac7
Merge branch 'develop' into gross-profit-product-bundle
2021-08-27 15:41:41 +05:30
Saqib
987746592c
fix: period closing voucher tests ( #27198 )
2021-08-27 15:41:26 +05:30
Saqib
8008598eb2
Merge branch 'develop' into gross-profit-product-bundle
2021-08-27 14:48:54 +05:30
Anupam
d701ad5313
fix: using frm instead of cur_frm
2021-08-27 13:09:52 +05:30
Rucha Mahabal
71b7c63ec0
feat: Ability to schedule onboarding and separation activities ( #26738 )
...
* refactor: employee onboarding form clean-up
* feat: ability to schedule onboarding / separation tasks
* feat: skip holidays while setting boarding activity dates
* chore: remove unused child table - Employee Onboarding Activity
* fix: tests
* fix: employee separation test
2021-08-27 11:12:24 +05:30
rohitwaghchaure
e6799d78ef
fix: operation time auto set to zero ( #27188 )
2021-08-27 10:46:45 +05:30
GangaManoj
535dd2d36d
fix: Move Packed Items table right below the Items table
2021-08-27 02:47:11 +05:30
GangaManoj
4353c5e339
fix: Disable Add Row and Delete Row for Bundle Items
2021-08-27 02:32:34 +05:30
GangaManoj
bdbd4f83ab
fix: Create separate section for Bundle Items
2021-08-27 02:29:47 +05:30
GangaManoj
20cfe60e84
feat: Populate Bundle Items table
2021-08-27 01:49:58 +05:30
GangaManoj
efd8a8b28e
feat: Add Bundle Items table
2021-08-27 01:49:28 +05:30
GangaManoj
681c92d646
fix: Make Sales Order field editable so the PO can be linked with an SO later
2021-08-27 01:48:46 +05:30
GangaManoj
c33f5cad01
fix: Hide Rate of Bundle Items while printing
2021-08-27 01:21:52 +05:30
GangaManoj
99e6e2ce3f
fix: Make Rate column read only by default
2021-08-27 01:15:01 +05:30
GangaManoj
6c03af815e
fix: Display Bundle Items right below the Items table
2021-08-27 01:14:23 +05:30
GangaManoj
e506cd6a2f
fix: Enable Fetch If Empty for Rate
2021-08-27 01:06:48 +05:30
GangaManoj
d4405c5e52
fix: Calculate Product Bundle price based on the prices of its child items
2021-08-27 01:02:34 +05:30
Deepesh Garg
ae7ec8e44d
fix: Base amount in tax gl entry
2021-08-26 23:51:09 +05:30
Frappe PR Bot
a1737c9a0c
fix: Production Plan: load document defaults for plan items & remove name column from listview ( #26584 ) ( #27184 )
...
(cherry picked from commit 69d88a921273c9e0ea29d7131232686a0be7bb78)
Co-authored-by: Richard Case <64409021+casesolved-co-uk@users.noreply.github.com>
2021-08-26 23:04:54 +05:30
Pawan Mehta
db69d1dc00
fix: fetch from more than one sales order in Maintenance Visit ( #26924 )
...
* [fix] #26336
* fix(ux): make customer field reqd for fetching SO
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-08-26 22:54:24 +05:30
Chillar Anand
f1b77360ee
feat(healthcare): Added Treatment Plan Template feature ( #26557 )
...
* feat: Added doctypes for treatment plan template
* feat: Added child doctype
* feat: Added validations for patient age
* chore: Clean up treatment plan template
* fix: Limit plan items to templates
* Added multiselectdialogbox for treatment plan template
* Add template name as autoname
* Clean up code
* Cleanup lint issues
* Clean up code
* Added tests for tpt filters
* Added test records
* Fix order of fields
* Added tests for care plan template
* Added age property for patient
* Clean up code
* Clean up list view
* Clean up code
* Fix lint issues
* Clean up test records
* Code cleanup
no-docs
* chore: Code cleanup
* chore: Use ORM instead of raw sql
* fix: Make treatment plan item fields mandatory
* fix: Added healthcare roles in permissions rules
* fix: Added filters for symptoms, diagnosis
* fix: Show applicable treatment plans button only if patient is present
* fix: Fix key error issues
* fix: Fix issues with filters in plan templates
* chore: Fix age filters
* refactor: appending treatment plan items
* fix: treatment plan test
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-08-26 22:15:30 +05:30
Rohan
16eed07a0f
fix: use Stripe's Price API for plan-price information ( #26107 )
...
* fix: use Stripe's new Plan API for price information
* patch: use inbuilt function to rename field
* fix: patch call
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-08-26 21:47:00 +05:30
Noah Jacob
422f67a4c9
refactor: update manufacturing module onboarding ( #26945 )
...
* refactor: updated manufacturing onboarding cards
* refactor: added form tours
* refactor: updated form tours and card descriptions
* Fix: Case of description
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-08-26 21:40:48 +05:30
Lovin Maxwell
f91faac7cd
fix: Pricing Rule on Transaction Based on Coupon ( #26949 )
2021-08-26 20:54:02 +05:30
Ankush Menat
ae55eab599
chore: remove deprecated and empty QUnit tests ( #27179 )
...
* chore: remove deprecated and empty QUnit tests
* ci: fix UI test config
Testing library was added on Frappe, in order to reuse command testing
library has to be installed during setup process.
2021-08-26 20:43:06 +05:30
Ankush Menat
a9852a5483
fix(ux): hide irrelevant fields for asset items ( #26274 )
2021-08-26 20:02:51 +05:30
Deepesh Garg
4b1f165429
fix: Use reverse debit and credit to get net amount in GL Entries ( #27174 )
...
* fix: Use reverse debit and credit to get net amount in GL Entries
* fix: Remove unused import
2021-08-26 18:34:15 +05:30
Ankush Menat
c07dce940e
fix: don't allow BOM's item code at any level of child items ( #27157 )
...
* refactor: bom recursion checking
* fix: dont allow bom recursion
if same item_code is added in child items at any level, it shouldn't be allowed.
* test: add test for bom recursion
* test: fix broken prodplan test using recursive bom
* test: fix recursive bom in tests
2021-08-26 18:33:42 +05:30
Marica
73b686a498
Merge pull request #27169 from marination/internal-customer-util
...
fix: Remove duplicate `create_internal_customer` utility
2021-08-26 16:42:28 +05:30
Ankush Menat
e7109c18db
fix: negative qty validation on stock reco cancellation ( #27170 )
...
* test: negative stock validation on SR cancel
* fix: negative stock setting ignored in stock reco
In stock reconcilation cancellation negative stock setting is ignored as
`db.get_value` is returning string `'0'` which is not casted to int/bool
for further logic. This causes negative qty, which evantually gets
caught by reposting but by design this should stop cancellation.
* test: typo and minor refactor
2021-08-26 16:40:45 +05:30
marination
501b91a608
fix: internal customer util returns str not doc object
2021-08-26 16:18:23 +05:30
Marica
e11bfe7da4
Merge pull request #27111 from 18alantom/feat-bom-process-loss-fp
...
feat: add provision for process loss in manufac (frontport #26151 )
2021-08-26 16:10:05 +05:30
marination
45edfd9d50
fix: Remove duplicate create_internal_customer
util
...
- Introduced via https://github.com/frappe/erpnext/pull/27086
2021-08-26 15:53:52 +05:30
Anupam
de488f68c0
adding test cases
2021-08-26 15:27:18 +05:30
Saqib
8ed6338336
refactor!: remove e_invoice utils ( #27167 )
2021-08-26 13:27:16 +05:30
18alantom
b389b8c3ad
fix: prevent over riding scrap table values, name kwargs, set currency
2021-08-26 13:15:57 +05:30
Marica
f4dc9ee2aa
fix: Don't create inward SLE against SI unless is internal customer enabled ( #27086 )
...
* fix: Dont create inward SLE against SI unless is internal customer enabled
- Check if is internal customer enabled apart from target warehouse
- Test to check if inward SLE is made if target warehouse is accidentally set but customer is not internal
* test: Use internal customer for delivery of bundle items to target warehouse
- created `create_internal_customer` util
- reused it in delivery note and sales invoice tests
- use internal customer for target warehouse test in delivery note
2021-08-26 13:12:51 +05:30
18alantom
e20d21924c
Merge branch 'develop' into feat-bom-process-loss-fp
2021-08-26 13:05:59 +05:30
Deepesh Garg
e2af9d5761
Merge pull request #27039 from nextchamp-saqib/common-party-acc
...
feat: common party accounting
2021-08-26 12:58:59 +05:30
rohitwaghchaure
fe4540d74d
fix: allow to change rate manually in case of stand-alone credit note ( #27036 )
...
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2021-08-26 12:52:36 +05:30
Anuja Pawar
baa548a3df
fix(regional): minor fixes and test for South Africa VAT report ( #26933 )
...
* fix: added test and minor fixes
* fix: sider fixes
* fix: sider
* fix: test fixes
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2021-08-26 12:48:43 +05:30
Rucha Mahabal
642b4c805c
fix: Fee Validity fixes ( #27156 )
...
* chore: update Fee Validity form labels
* fix: first appointment should not be considered for Fee Validity
* fix: Fee Validity test cases
* fix: appointment test case
2021-08-26 12:15:49 +05:30
Anupam
fbac514929
feat: prospect permission
2021-08-26 12:14:29 +05:30
Brian Pond
1a919773d7
fix: Customers 'primary_address' not updated automatically ( #26798 ) ( #26799 )
...
* Fix for Issue #26798
This PR is a fix for GitHub Issue 26798:
https://github.com/frappe/erpnext/issues/26798
TLDR: When an Address is updated, and that Address is a Customer's Primary Address, update the Read Only field `customer.primary_address`
* Update address.py
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2021-08-26 11:57:28 +05:30
Anupam Kumar
c8f22e5524
fix: removing toggle_display for address and contact HTML ( #27152 )
2021-08-26 10:46:55 +05:30
Anupam
efdeee4d1f
fix: conflicts
2021-08-26 00:15:35 +05:30
Saqib Ansari
be7a38b662
fix: cost center in test_sales_invoice_against_supplier
2021-08-25 21:35:32 +05:30
Ashish Shah
b99c011947
fix: unable to create manual / auto asset depreciation entry when cost_center is mandatory ( #26912 )
...
Summary : unable to create manual / auto asset depreciation entry when cost_center is mandatory
Reason: Though we are calculating value for depreciation_cost_center, it is not passed in credit_entry(it is passed in debit_entry) and this prevents creation of manual / auto asset depreciation entry when cost_center is mandatory
Solution : pass already calculated depreciation_cost_center value in credit_entry (in line with, already done as in debit_entry)
2021-08-25 21:33:08 +05:30
Ganga Manoj
842ceb1301
fix: cannot reconcile bank transactions against internal transfer payment entries ( #26932 )
...
* fix: Only set Clearance Date for Payment Entries of type Internal Transfer if both Transactions have been reconciled
* fix: Reset clearance_date for intra-company Payment Entries that have only been reconciled with one Bank Transaction
* fix: indentation and args
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-08-25 20:32:26 +05:30
Saqib Ansari
c6c7a8b5cf
fix: cost center & naming series
2021-08-25 20:17:04 +05:30
Saqib Ansari
7254368fc5
perf: reduce number of queries to get party link
2021-08-25 20:15:23 +05:30
Rohan
87308465d8
fix: create zero-dollar invoices fro trial subscriptions ( #26441 )
2021-08-25 20:11:05 +05:30
Saqib Ansari
a2f8d6c31a
fix: party link permissions
2021-08-25 20:10:19 +05:30
Saqib Ansari
c101b42d4a
feat: validate multiple links
2021-08-25 20:08:28 +05:30
Chillar Anand
81b28b8998
fix(healthcare): Removed ignore user permissions flag in appointment ( #27129 )
2021-08-25 20:08:11 +05:30
rohitwaghchaure
ad45ddcabe
fix: sequence of sub-operations in job card ( #27138 )
2021-08-25 20:07:18 +05:30
Saqib Ansari
881301ca9b
Merge branch 'develop' of https://github.com/frappe/erpnext into common-party-acc
2021-08-25 20:02:27 +05:30
Anupam Kumar
4d98be2126
feat: provision to create customer from opportunity ( #27141 )
...
* feat: provision to create customer from opportunity
* fead: linking of address and contact
* revert: create_opportunity_address_contact
* enabming print hide and no copy
2021-08-25 19:18:17 +05:30
18alantom
c7e11c89ff
fix: get filters to work
...
- reorder and rename columns
- add work order filter
2021-08-25 18:58:56 +05:30
Saqib
60675379c2
fix: partial rename while replacing abbreviation ( #27065 )
2021-08-25 18:26:00 +05:30
Frappe PR Bot
81b4590479
fix: TDS calculation on net total ( #27058 ) ( #27140 )
...
(cherry picked from commit 4eb7c2a011f3abbe547c2a32978e7af6e1fd6d33)
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2021-08-25 18:18:16 +05:30
Anupam
5ad8afcc8d
revert: creation of customer from opportunity
2021-08-25 17:36:53 +05:30
Marica
7cb1eec1f8
Merge pull request #27055 from 18alantom/update-stock-onboarding-fp
...
refactor: update stock module onboarding (frontport #25745 )
2021-08-25 16:59:28 +05:30
Ankush Menat
8d116fb9ff
fix: remove VARCHARs from Sales Invoice ( #27136 )
...
Sales Invoice doctype is starting to hit row length limit as many
integrations add custom fields on this doctype. This is just a small
change to remove VARCHAR(140) fields and reduce row size wherever
possible.
2021-08-25 16:45:41 +05:30
Anupam
c644fbb102
fix: sider issues
2021-08-25 16:35:34 +05:30
18alantom
dbea840ecf
fix: re-order tour to circumvent glitchy save highlight
2021-08-25 16:34:31 +05:30
Saqib
62114b226f
feat: unreconcile on cancellation of bank transaction ( #27109 )
2021-08-25 16:25:51 +05:30
Anupam
dfcac64b44
fix: review chnages
2021-08-25 16:24:46 +05:30
GangaManoj
e4c25bf4bb
fix: Return if there are no Items
2021-08-25 15:40:42 +05:30
GangaManoj
3135d6dc6a
fix: Get Bundle Items
2021-08-25 15:35:40 +05:30
GangaManoj
13ae10b3a2
fix: Remove comments
2021-08-25 15:20:27 +05:30
Chillar Anand
a65498dc61
fix(healthcare): Made payment fields mandatory for new appointments ( #26608 )
...
* fix(healthcare): Made payment fields mandatory for new appointments
* fix: sider issues
* fix: Fix failing test
* fix: Patient appointment invoicing
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
Co-authored-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>
2021-08-25 14:40:22 +05:30
Marica
b7ef4ce7a2
Merge pull request #27052 from 18alantom/fix-scrap-items-updation
...
fix: update scrap table item details; typo
2021-08-25 12:32:49 +05:30
Afshan
8366b6322e
fix: validate party and party type only if both available ( #27002 )
...
* fix: validate party and party type only if both available
* fix: indentation
2021-08-25 11:57:24 +05:30
Saqib
1dadea38a5
fix: remove unexpected comma ( #27132 )
2021-08-25 11:05:51 +05:30
GangaManoj
bea0f7a202
fix: Get data when grouped by invoice and otherwise
2021-08-25 02:52:18 +05:30
GangaManoj
96909b6c3b
fix: Display only the Invoice rows in bold
2021-08-25 02:49:14 +05:30
GangaManoj
b02effbc47
fix: Indentation
2021-08-25 01:00:40 +05:30
Ganga Manoj
3e5bbc9aa6
Merge branch 'develop' into gross-profit-product-bundle
2021-08-25 00:55:47 +05:30
GangaManoj
5f8c2b0946
fix: Remove base_rate and buying_rate for Invoice rows
2021-08-25 00:33:55 +05:30
GangaManoj
77352ae47e
fix: Only update Product Bundle prices if 'Calculate Product Bundle Price based on Child Items' Rates' is enabled
2021-08-25 00:12:43 +05:30
GangaManoj
2dbf8075eb
fix: Calculate total buying_amount for each invoice
2021-08-25 00:09:07 +05:30
GangaManoj
3edb1938a9
fix: Fetch bundle item details
2021-08-24 23:38:24 +05:30
GangaManoj
257215f479
fix: Fetch base_net_total for each Invoice
2021-08-24 23:32:19 +05:30
GangaManoj
1956f62ad8
fix: Remove qty from Sales Invoice rows
2021-08-24 23:30:50 +05:30
Subin Tom
fbc5977248
fix: Updated timestamp for pos invoice json ( #27110 )
...
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
2021-08-24 22:34:02 +05:30
GangaManoj
1d82c3effe
fix: Make Rate editable if editable_bundle_item_rates is checked
2021-08-24 22:25:59 +05:30
Dany Robert
c7bad657b1
fix: broken URL in supplier portal ( #26823 )
...
* fix: broken URL
The quotations are supplier quotations, not sales quotation.
* fix: remove erpnext from path
2021-08-24 22:10:14 +05:30
GangaManoj
a575d05a3e
fix: Make fieldname more concise
2021-08-24 22:09:36 +05:30
Anupam Kumar
1d6ef4b0d3
fix: replacing $.each -> forEach in SI ( #26995 )
...
* fix: replacing $.each -> forEach in SI
* fix: removed console log
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-08-24 22:06:19 +05:30
GangaManoj
2293ba302a
fix: Add checkbox to enable calculation of Product Bundle price based on child Items' rates
2021-08-24 22:04:03 +05:30
Frappe PR Bot
512ddc589f
fix: timesheet amount issue ( #25993 ) ( #26889 )
...
* fix: timesheet amount issue
* fix: timesheet detail rate conversion
* fix: condition to check timesheet currency
* fix: removing console statement
(cherry picked from commit a6aa6cd7d6
)
Co-authored-by: Anupam Kumar <anupamvns0099@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-08-24 22:00:32 +05:30
Deepesh Garg
c30fb04e96
fix(minor): Update GSTR-1 json version ( #27074 )
2021-08-24 21:57:25 +05:30
GangaManoj
129df6e129
fix: Update Product Bundle rate based on its updated amount
2021-08-24 21:55:54 +05:30
GangaManoj
31482a08dc
fix: Update Product Bundle price based on the rates of its child Items
2021-08-24 21:42:44 +05:30
Pruthvi Patel
7c957d72b3
perf: reduce number of queries to validate selling price ( #26225 )
...
* perf: reduce number of queries to validate selling price
* fix: improved flow and formatting
* fix: improve condition and use of `as_dict`
Co-authored-by: Sagar Vora <sagar@resilient.tech>
2021-08-24 21:24:25 +05:30
Nabin Hait
b99a8cb96e
Merge pull request #27087 from deepeshgarg007/validate_due_date_fix
...
fix: Ignore due date validations if payment terms are copied from orders/receipts
2021-08-24 21:10:44 +05:30
Nabin Hait
f5e52549e2
Merge branch 'develop' into fix-scrap-items-updation
2021-08-24 21:07:59 +05:30
Nabin Hait
14332ad8a2
Merge pull request #27114 from frappe-pr-bot/backport/develop/24664
...
refactor: social media post fixes
2021-08-24 21:04:36 +05:30
Frappe PR Bot
255b99ebdc
feat: Employee reminders ( #25735 ) ( #27115 )
...
* feat: Add reminders section to HR Settings
* refactor: Extract generic function for getting Employees
* feat: Employee Work Anniversary Reminder
* feat: Daily Holiday Reminder
* fix: Unnecessary params and replace [] with .get()
* test: Daily Holiday Reminders
* test: is_holiday basic tests
* refactor: Move employee reminders code to separate module
* feat: Add advance reminder to HR settings
* feat: Advance Holiday Reminders
* refactor: get_holidays_for_employee
* feat: Email holiday reminders in advance + tests
* fix: Remove unused import
* refactor: HR Setting Reminder Section
* refactor: Remove Daily Holiday Reminders feat
* feat: Reminder miss warning
* fix: Failing test and function name change
* chore: Add patch for field rename
* chore: Rename frequency label
* fix: Failing patch test
* fix: sider and removed description of fields
* fix: email alignment
Co-authored-by: pateljannat <pateljannat2308@gmail.com>
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
(cherry picked from commit 24b2a315818d08ad4cb03347ccf5297df916a5ac)
Co-authored-by: Mohammad Hussain Nagaria <34810212+NagariaHussain@users.noreply.github.com>
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
2021-08-24 20:19:22 +05:30
18alantom
95a2565d86
fix: correct value in test
2021-08-24 20:18:53 +05:30
18alantom
aff9aee29c
Merge branch 'develop' into feat-bom-process-loss-fp
2021-08-24 20:15:51 +05:30
18alantom
c3ce3f918d
fix: remove spurious function 'toggle_operations'
2021-08-24 20:15:19 +05:30
Anupam Kumar
1c279af0b3
fix: lead name issue ( #26999 )
...
* fix: lead name issue
* fix: change lead name wrt first name, middle and last name
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
2021-08-24 20:06:04 +05:30
Rucha Mahabal
d0cc1be230
Merge branch 'develop' into backport/develop/24664
2021-08-24 20:05:53 +05:30
Saqib
f1313302c9
fix: pos invoice test ( #27113 )
2021-08-24 19:45:21 +05:30
Marica
3167b58aee
Merge branch 'develop' into fix-scrap-items-updation
2021-08-24 19:33:09 +05:30
Anupam Kumar
164acc845a
refactor: social media post fixes ( #24664 )
...
* fix: social media post fixes
* feat: post metrics and some fixes
* fix: sider issues
* fix: sider issue
* fix: reverting optional chaning statements
* fix: sider issues
* fix: review chnages
* fix: text trigger check
* fix: sider issue
(cherry picked from commit f7e0edecc9ce45ba7baa4c17b2b35f487dffccf2)
2021-08-24 13:47:00 +00:00
18alantom
8f73d587f9
feat: process loss report, fix set pl query condition
2021-08-24 18:38:23 +05:30
GangaManoj
b4b6d10b5d
fix: Add editable Rate column
2021-08-24 17:59:11 +05:30
GangaManoj
8af5802e42
fix: Populate Bundle Items table
2021-08-24 17:58:23 +05:30
GangaManoj
91af0d6ffb
fix: Add Bundle Items table
2021-08-24 17:57:55 +05:30
Afshan
ad06fb2179
fix: calculation of gross profit percentage in Gross Profit Report ( #27045 )
2021-08-24 17:35:01 +05:30
Saqib
1db812ab9f
Merge branch 'develop' into common-party-acc
2021-08-24 17:27:43 +05:30
Saqib
f47cbae5e0
feat: allow draft pos invoices even if no stock available ( #27078 )
2021-08-24 17:27:27 +05:30
Saqib
9198caa5e7
fix: incorrect gl entry on period closing involving finance books ( #26921 )
2021-08-24 17:26:23 +05:30
Subin Tom
2e5525aba9
fix: Correct price list rate value in return si ( #27097 )
2021-08-24 17:24:41 +05:30
Saqib
ce129a1414
feat: re-arrange company doctype fields ( #27091 )
2021-08-24 17:23:14 +05:30
Anupam
0c6212189e
feat: link lead communication to prospect
2021-08-24 16:49:53 +05:30
Marica
774f305713
Merge branch 'develop' into update-stock-onboarding-fp
2021-08-24 16:23:42 +05:30
Subin Tom
d4d5a4221a
feat: coupon code discount in pos invoice ( #27004 )
2021-08-24 16:22:46 +05:30
18alantom
b58853e89d
feat: add procss_loss_qty field in work order
2021-08-24 16:11:29 +05:30
Anupam
3610882077
fix: reverting local chnages
2021-08-24 15:51:57 +05:30
Anupam
797b19a14a
feat: creation of prospect from lead
2021-08-24 15:50:15 +05:30
Saqib
9e82c24b27
fix: pos closing entry cancellation test ( #27099 )
...
* fix: pos closing entry cancellation test
* fix: invalid imports
* fix: sider issue
2021-08-24 15:37:00 +05:30
Saqib
6cf9254ee5
fix: invalid imports ( #27101 )
2021-08-24 15:26:44 +05:30
18alantom
7fb08173b5
fix: reword error messages, fix test values
2021-08-24 15:01:38 +05:30
18alantom
ad735522cb
fix: rename form tours to doctype names, remove tours from js controllers
2021-08-24 14:54:38 +05:30
Marica
b9130bf4db
Merge branch 'develop' into fix-scrap-items-updation
2021-08-24 12:54:38 +05:30
Ankush Menat
c09d8a2809
fix(ux): keep stock entry title & purpose in sync ( #27043 )
...
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2021-08-24 12:20:34 +05:30
Ankush Menat
6de7b8ea93
fix: discard empty rows from update items ( #27021 )
2021-08-24 12:18:40 +05:30
Ankush Menat
0dff0beaba
fix: stock analytics report date range issues and add company filter ( #27014 )
...
* test: tests for correct get_period_date_ranges
* fix: stock analytics report date range issues
- Upon selecting second half of month with Monthly filter, data from
that period was missing.
- Solution: "round down" the date as per expected frequency.
* chore: drop py2 and fix misleading docstring
* test: fix test to avoid FY clash
* feat: add company filter in stock analytics report
[skip ci]
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2021-08-24 12:16:46 +05:30
rohitwaghchaure
6106a635f8
Merge branch 'develop' into fix-scrap-items-updation
2021-08-24 12:10:04 +05:30
Pruthvi Patel
332ac105b5
refactor: use read_only_depends_on
instead of code ( #27008 )
2021-08-24 12:07:38 +05:30
rohitwaghchaure
db385261f0
Merge pull request #27080 from rohitwaghchaure/fixed-stock-ledger-report-with-included-uom
...
fix: stock ledger report not working if include UOM selected in filter
2021-08-24 10:16:35 +05:30
rohitwaghchaure
95866b736e
Merge pull request #27081 from rohitwaghchaure/fixed-donot-overrride-batch-no
...
fix: batch no reset on changing of qty
2021-08-24 10:15:36 +05:30
Anupam
4a529f8039
feat: Prospect
2021-08-24 09:35:59 +05:30
rohitwaghchaure
da3220e38e
Merge branch 'develop' into fixed-stock-ledger-report-with-included-uom
2021-08-24 08:50:49 +05:30
Rushabh Mehta
49e0a4f287
Revert "fix: Salary component account filter ( #26604 )"
...
This reverts commit ae9d1d9617
.
2021-08-24 08:33:57 +05:30
GangaManoj
46650cce0d
fix: Calculate total buying_amount and gross profit for each invoice
2021-08-23 21:17:32 +05:30
Deepesh Garg
bd709f8ab0
fix: Ignore due date validations if payment terms are copied from orders/receipts
2021-08-23 19:05:52 +05:30
rohitwaghchaure
129a0fc8b2
Merge branch 'develop' into fixed-donot-overrride-batch-no
2021-08-23 18:07:22 +05:30
Deepesh Garg
69973a65aa
Merge pull request #26900 from deepeshgarg007/payment_entry_validations_and_trigger_develop
...
fix: Multiple fixes in payment entry
2021-08-23 18:03:01 +05:30
Subin Tom
47b63a627d
fix: Eway bill test update to check ver 1.0.0421 ( #27083 )
2021-08-23 15:38:26 +05:30
Rohit Waghchaure
e1f070437a
fix: selected batch no changed on updation of qty
2021-08-23 14:27:55 +05:30
Rohit Waghchaure
098d349bf4
fix: stock ledger report not working if include uom selected in filter
2021-08-23 13:36:13 +05:30
Subin Tom
8b2fe9e793
fix: eway bill version changed to 1.0.0421 ( #27044 )
2021-08-23 11:17:31 +05:30
Subin Tom
7d627df4db
fix: pos return payment mode issue ( #26872 )
2021-08-23 11:05:07 +05:30
Deepesh Garg
df185045a1
Merge branch 'develop' into payment_entry_validations_and_trigger_develop
2021-08-23 10:34:28 +05:30
Deepesh Garg
496bff5136
feat: Column for total amount due in Accounts Receivable/Payable Summary ( #27069 )
2021-08-22 18:10:51 +05:30
Deepesh Garg
57e326e7d0
fix: Consolidated balance sheet showing incorrect values ( #26975 )
2021-08-21 17:59:11 +05:30
Saqib
5395f56c88
Merge branch 'develop' into common-party-acc
2021-08-20 20:42:50 +05:30
Saqib
ec258551bf
fix: flaky test for SLA ( #27051 )
2021-08-20 19:09:31 +05:30
GangaManoj
d1453c0cd0
fix: Remove Item Code and Item Name columns
2021-08-20 18:26:17 +05:30
GangaManoj
75d4fc99fc
fix: Display Items in the format Item Code: Item Name
2021-08-20 18:25:36 +05:30
Alan
62c590261c
refactor: rectify typo ( #27057 )
...
[skip ci]
2021-08-20 18:21:09 +05:30
18alantom
810bce8da2
Merge branch 'develop' into update-stock-onboarding-fp
2021-08-20 16:31:27 +05:30
18alantom
f4487c3ae5
refactor: use Form Tour doc instead of controller form tour
...
note - keeping controller form tours as a fallback, new form tours
seem to work only for Stock Settings
2021-08-20 16:25:20 +05:30
18alantom
77ebbdd172
fix: minor changes
...
- remove Is Group from warehouse
- change stock entry type
- link to stock entry type
- add posting date to stock reco
- change report to Stock Projected Qty
- highlight quality inspection action
- remove allow neg highlight
2021-08-20 16:21:33 +05:30
Deepesh Garg
2b2572b9b9
fix: Cascade deletion for Company ( #26923 )
...
* fix: Cascade deletion for Company
2021-08-20 14:40:12 +05:30
18alantom
6ef16ee4fb
fix: update scrap table item details; typo
2021-08-20 12:24:13 +05:30
Saqib
c335962827
refactor!: drop e-invoicing integration from erpnext ( #26940 )
2021-08-20 11:10:46 +05:30
Saqib
153fe1cdb4
refactor: scan barcode field scanning ( #26990 )
2021-08-20 11:09:51 +05:30
Nabin Hait
b8c998119b
Merge pull request #27040 from marination/cart-pl-exchange-rate
...
fix: Shopping cart Exchange rate validation
2021-08-20 10:56:10 +05:30
Nabin Hait
12d7f83998
Merge pull request #27033 from noahjacob/ux_promo_scheme_fix
...
fix(ux): removed rate from grid view
2021-08-20 10:51:59 +05:30
Nabin Hait
657e61ae6d
Merge pull request #27028 from noahjacob/prompt_warehouse_fix
...
fix: incorrect mandatory error message for warehouse
2021-08-20 10:48:34 +05:30
GangaManoj
b5fac83987
fix: Add items belonging to Product Bundles as children
2021-08-20 06:07:53 +05:30
GangaManoj
33f100d75d
fix: Set initial_depth to 3
2021-08-20 06:06:47 +05:30
GangaManoj
97a1d426a3
fix: Assign indent and parent_invoice
2021-08-20 03:54:19 +05:30
GangaManoj
779a1d68a5
fix: Make Invoice row bold
2021-08-20 02:38:34 +05:30
GangaManoj
5ffaff8e48
fix: Display items as descendants of invoices
2021-08-20 02:20:18 +05:30
GangaManoj
17a154017b
fix: Display data in tree form
2021-08-20 02:19:18 +05:30
GangaManoj
76921137ed
fix: Return data as dict if the report is grouped by Invoice
2021-08-20 02:16:49 +05:30
marination
8046d15ef0
chore: Comment out obsolete test
...
- Modifying this test means considering extreme edge cases, which seems pointless now
2021-08-19 21:10:30 +05:30
Noah Jacob
f13315809e
refactor: renamed varint_item_code to variant_item_code ( #27025 )
2021-08-19 20:28:30 +05:30
marination
45617ae22f
fix: Shopping cart Exchange rate validation
...
- Use `get_exchange_rate` to check for price list exchange rate in cart settings
- Move cart exchange rate validation for Price List from hooks to doc event
- Call cart exchange rate validation on PL update only if PL is in cart and currency is changed
2021-08-19 20:01:05 +05:30
Alan
9225f02599
fix: pass planned start date to created work order ( #27031 )
...
* fix: pass planned start date to created workorder
* test: production plan to work order start date
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-08-19 18:49:20 +05:30
Saqib Ansari
8e79c48db8
fix: remove unwanted filter query
2021-08-19 18:10:02 +05:30
Saqib Ansari
71e7254184
test: creation of advance entry on invoice submission
2021-08-19 18:09:35 +05:30
Saqib Ansari
977b09b6ba
feat: auto create advance entry on invoice submission
2021-08-19 18:09:35 +05:30
Saqib Ansari
cad08bc428
feat: toggle to enable common party accounting
2021-08-19 18:09:35 +05:30
Saqib Ansari
dddc29fdc1
feat: initialize party link for customer & suppliers
2021-08-19 18:09:35 +05:30
Afshan
c60d5523bc
fix: add child item groups into the filters ( #26997 )
...
* fix: add child item groups into the filters
* fix: appending values to proper variable
* fix: refactor the loop
2021-08-19 16:23:18 +05:30
Noah Jacob
6541453c16
fix(ux): removed rate from grid view
2021-08-19 15:53:55 +05:30
Alan
09f34e558e
fix: set production plan to completed even on over production ( #27027 )
2021-08-19 15:51:36 +05:30
Ankush Menat
993b0532f8
Merge pull request #27026 from ankush/eq_assign
...
fix: equality check instead of assignment
[skip ci]
2021-08-19 15:43:34 +05:30
Noah Jacob
cf8d2d97dd
fix: Incorrect mandatory error message for warehouse
2021-08-19 15:43:20 +05:30
Ankush Menat
4551d7d602
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
Deepesh Garg
869e36c33a
Merge pull request #26737 from nemesis189/payment-reconc-party-validation-fix
...
fix: Payment Reconciliation party validation issue
2021-08-19 12:40:54 +05:30
Afshan
ecd6584c50
fix: assigning values to rows in sales register reports ( #26546 )
...
* fix: assigning values to rows in sales register reports
* fix: check for is_internal_customer for unrealized_profit_loss_account
2021-08-19 12:18:27 +05:30
Frappe PR Bot
44434ff70f
fix: date_unchanged calculation in "Update Items" ( #26992 ) ( #27011 )
...
Branch corrected https://github.com/frappe/erpnext/pull/26058
ERPNext generates "Cannot set quantity less than delivered quantity" error even the delivered qty is zero when user clicks "Update Items".
"date_unchanged" variable gets false value because of new_date is string.
"getdate(new_date)" corrects the date comparison.
![ERPNext_PR](https://user-images.githubusercontent.com/710051/121928377-c0263180-cd48-11eb-8cd9-eda7dace09d6.gif )
(cherry picked from commit d8a7abcd02f674bf6c4270a817ae9762a0b57140)
Co-authored-by: Türker Tunalı <turkert@hotmail.com>
2021-08-18 18:33:06 +05:30